aboutsummaryrefslogtreecommitdiffstats
path: root/application-preprocessor
diff options
context:
space:
mode:
authorArne Juul <arnej@yahooinc.com>2022-10-24 10:02:58 +0000
committerArne Juul <arnej@yahooinc.com>2022-10-24 10:02:58 +0000
commit1417a48bd4aecfb5e182d6c7b81960e3d7232309 (patch)
tree256cff43ab30ea2c5efbe31c9d1ad7eb316eefea /application-preprocessor
parentfa29e75a71b49fc3925349457bb43de03b6d60d8 (diff)
* apply new common bootstrap
* remove now-duplicated code * prefer using ${VESPA_HOME} environment variable
Diffstat (limited to 'application-preprocessor')
-rw-r--r--application-preprocessor/src/main/sh/vespa-preprocess-application11
1 files changed, 6 insertions, 5 deletions
diff --git a/application-preprocessor/src/main/sh/vespa-preprocess-application b/application-preprocessor/src/main/sh/vespa-preprocess-application
index fa0545f7c20..172ee1653d2 100644
--- a/application-preprocessor/src/main/sh/vespa-preprocess-application
+++ b/application-preprocessor/src/main/sh/vespa-preprocess-application
@@ -72,13 +72,14 @@ findhost () {
findroot
findhost
-# END environment bootstrap section
-
ROOT=${VESPA_HOME%/}
export ROOT
-cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; }
+
+# END environment bootstrap section
+
+cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
# get common PATH:
-. $ROOT/libexec/vespa/common-env.sh
+. ${VESPA_HOME}/libexec/vespa/common-env.sh
-java -cp $ROOT/lib/jars/application-preprocessor-jar-with-dependencies.jar com.yahoo.application.preprocessor.ApplicationPreprocessor "$@"
+java -cp ${VESPA_HOME}/lib/jars/application-preprocessor-jar-with-dependencies.jar com.yahoo.application.preprocessor.ApplicationPreprocessor "$@"