Merge pull request #24548 from vespa-engine/arnej/common-handle-env-root

* apply new common bootstrap

49 files changed, 193 insertions, 69 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 "$@"
diff --git a/config-proxy/src/main/sh/vespa-config-ctl.sh b/config-proxy/src/main/sh/vespa-config-ctl.sh
index d6d0075b555..e02073787db 100755
--- a/config-proxy/src/main/sh/vespa-config-ctl.sh
+++ b/config-proxy/src/main/sh/vespa-config-ctl.sh
@@ -72,21 +72,22 @@ 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; }
 
 P_SENTINEL=var/run/sentinel.pid
 P_CONFIG_PROXY=var/run/configproxy.pid
 
 export P_SENTINEL P_CONFIG_PROXY
 
-LOGDIR="$ROOT/logs/vespa"
+LOGDIR="${VESPA_HOME}/logs/vespa"
 LOGFILE="$LOGDIR/vespa.log"
 VESPA_LOG_TARGET="file:$LOGFILE"
-VESPA_LOG_CONTROL_DIR="$ROOT/var/db/vespa/logcontrol"
+VESPA_LOG_CONTROL_DIR="${VESPA_HOME}/var/db/vespa/logcontrol"
 cp="libexec/vespa/patches/configproxy:lib/jars/config-proxy-jar-with-dependencies.jar"
 
 VESPA_LOG_LEVEL="all -debug -spam"
@@ -101,7 +102,7 @@ hname=$(vespa-print-default hostname)
 CONFIG_ID="hosts/$hname"
 export CONFIG_ID
 export MALLOC_ARENA_MAX=1 #Does not need fast allocation
-export LD_LIBRARY_PATH="$VESPA_HOME/lib64"
+export LD_LIBRARY_PATH="${VESPA_HOME}/lib64"
 
 
 case $1 in
diff --git a/config-proxy/src/main/sh/vespa-config-loadtester.sh b/config-proxy/src/main/sh/vespa-config-loadtester.sh
index 2dcf006aa1d..9da84e1edc3 100644
--- a/config-proxy/src/main/sh/vespa-config-loadtester.sh
+++ b/config-proxy/src/main/sh/vespa-config-loadtester.sh
@@ -72,11 +72,11 @@ findhost () {
 findroot
 findhost
 
-# END environment bootstrap section
-
 ROOT=${VESPA_HOME%/}
 export ROOT
 
+# END environment bootstrap section
+
 echo "# Using CLASSPATH=$CLASSPATH, args=$@"
 
-java -Xms1g -Xmx1g -cp $CLASSPATH:$ROOT/lib/jars/config-proxy-jar-with-dependencies.jar com.yahoo.vespa.config.benchmark.LoadTester "$@"
+java -Xms1g -Xmx1g -cp $CLASSPATH:${VESPA_HOME}/lib/jars/config-proxy-jar-with-dependencies.jar com.yahoo.vespa.config.benchmark.LoadTester "$@"
diff --git a/config-proxy/src/main/sh/vespa-config-verification.sh b/config-proxy/src/main/sh/vespa-config-verification.sh
index 178193fdbd5..dadf27bd0a3 100644
--- a/config-proxy/src/main/sh/vespa-config-verification.sh
+++ b/config-proxy/src/main/sh/vespa-config-verification.sh
@@ -72,11 +72,11 @@ findhost () {
 findroot
 findhost
 
-# END environment bootstrap section
-
 ROOT=${VESPA_HOME%/}
 export ROOT
 
+# END environment bootstrap section
+
 echo "# Using CLASSPATH=$CLASSPATH, args=$@"
 
-java -cp $CLASSPATH:$ROOT/lib/jars/config-proxy-jar-with-dependencies.jar com.yahoo.vespa.config.proxy.ConfigVerification "$@"
+java -cp $CLASSPATH:${VESPA_HOME}/lib/jars/config-proxy-jar-with-dependencies.jar com.yahoo.vespa.config.proxy.ConfigVerification "$@"
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver
index 8e7a9d7839a..a16a93741e0 100755
--- a/configserver/src/main/sh/start-configserver
+++ b/configserver/src/main/sh/start-configserver
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd
index 47d62aae3a8..30aa357de12 100644
--- a/configserver/src/main/sh/start-logd
+++ b/configserver/src/main/sh/start-logd
@@ -72,15 +72,16 @@ findhost () {
 findroot
 findhost
 
-# END environment bootstrap section
-
 ROOT=${VESPA_HOME%/}
+export ROOT
+
+# END environment bootstrap section
 
-export VESPA_CONFIG_ID="file:$VESPA_HOME/conf/logd/logd.cfg"
+export VESPA_CONFIG_ID="file:${VESPA_HOME}/conf/logd/logd.cfg"
 
 if [ "$cloudconfig_server__multitenant" = "true" ] || [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then
     PIDFILE_LOGD=var/run/logd.pid
     VESPA_SERVICE_NAME=logd
     export VESPA_SERVICE_NAME
-    vespa-runserver -r 30 -s logd -p $PIDFILE_LOGD -- ${ROOT}/sbin/vespa-logd
+    vespa-runserver -r 30 -s logd -p $PIDFILE_LOGD -- ${VESPA_HOME}/sbin/vespa-logd
 fi
diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver
index ae03a8b1b39..2ee6ac4fccf 100755
--- a/configserver/src/main/sh/stop-configserver
+++ b/configserver/src/main/sh/stop-configserver
@@ -72,23 +72,21 @@ findhost () {
 findroot
 findhost
 
-# END environment bootstrap section
-
 ROOT=${VESPA_HOME%/}
 export ROOT
-cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; }
 
-# get common PATH etc:
-. $ROOT/libexec/vespa/common-env.sh
+# END environment bootstrap section
+
+cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
 
 fixlimits
 
 # runserver takes care of making sure that we're not running several
 # instances and saving its pid in this file:
-PIDFILE_CONFIGSERVER=${ROOT}/var/run/configserver.pid
+PIDFILE_CONFIGSERVER=${VESPA_HOME}/var/run/configserver.pid
 PIDFILE_LOGD=var/run/logd.pid
 
-VESPA_LOG_TARGET="file:${ROOT}/logs/vespa/vespa.log"
+VESPA_LOG_TARGET="file:${VESPA_HOME}/logs/vespa/vespa.log"
 export VESPA_LOG_TARGET
 
 if [ "$cloudconfig_server__multitenant" = "true" ] || [ "$VESPA_CONFIGSERVER_MULTITENANT" = "true" ]; then
diff --git a/configserver/src/main/sh/vespa-configserver-remove-state b/configserver/src/main/sh/vespa-configserver-remove-state
index 466a68522ca..cd371b1073e 100755
--- a/configserver/src/main/sh/vespa-configserver-remove-state
+++ b/configserver/src/main/sh/vespa-configserver-remove-state
@@ -72,10 +72,12 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-ROOT=${VESPA_HOME%/}
-cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; }
+cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
 
 usage() {
     (
@@ -128,7 +130,7 @@ removedata() {
 
 confirm() {
     confirmed=false
-    echo -n 'Really remove state for config server in '$ROOT/$1'? Type "yes" if you are sure ==> ' 1>&2
+    echo -n 'Really remove state for config server in '${VESPA_HOME}/$1'? Type "yes" if you are sure ==> ' 1>&2
     answer=no
     read answer
     if [ "$answer" = "yes" ]; then
diff --git a/container-core/src/main/sh/find-pid b/container-core/src/main/sh/find-pid
index 57393140e0b..74eade28d00 100755
--- a/container-core/src/main/sh/find-pid
+++ b/container-core/src/main/sh/find-pid
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 set -uo pipefail
@@ -82,7 +85,7 @@ if (( $# != 1 )); then
 fi
 
 readonly service=$1
-readonly pid_file="$VESPA_HOME/var/run/$service.pid"
+readonly pid_file="${VESPA_HOME}/var/run/$service.pid"
 if [ -f "$pid_file" ]; then
   parent_pid=$(cat "$pid_file")
   pid=$(pgrep --parent $parent_pid)
diff --git a/container-core/src/main/sh/vespa-jvm-dumper b/container-core/src/main/sh/vespa-jvm-dumper
index c0f5e653911..20ba1d59f53 100755
--- a/container-core/src/main/sh/vespa-jvm-dumper
+++ b/container-core/src/main/sh/vespa-jvm-dumper
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 set -euo pipefail
@@ -89,7 +92,7 @@ if ! [ -d "${output_directory}" -a -w "${output_directory}" ]; then
   echo "Directory '${output_directory}' is not writable"
   exit 1
 fi
-jvm_pid=$($VESPA_HOME/libexec/vespa/find-pid "$service")
+jvm_pid=$(${VESPA_HOME}/libexec/vespa/find-pid "$service")
 echo "Pid for '${service}' is '${jvm_pid}'"
 
 echo "Creating heap dump"
diff --git a/container-core/src/main/sh/vespa-load-balancer-status b/container-core/src/main/sh/vespa-load-balancer-status
index b9a54845532..ff2c3c88d3e 100755
--- a/container-core/src/main/sh/vespa-load-balancer-status
+++ b/container-core/src/main/sh/vespa-load-balancer-status
@@ -74,6 +74,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 set -eu
diff --git a/filedistribution/src/main/sh/vespa-status-filedistribution.sh b/filedistribution/src/main/sh/vespa-status-filedistribution.sh
index 114186eb0d4..3d930c72ccf 100644
--- a/filedistribution/src/main/sh/vespa-status-filedistribution.sh
+++ b/filedistribution/src/main/sh/vespa-status-filedistribution.sh
@@ -72,9 +72,10 @@ findhost () {
 findroot
 findhost
 
-# END environment bootstrap section
-
 ROOT=${VESPA_HOME%/}
+export ROOT
+
+# END environment bootstrap section
 
 if [ "$VESPA_ENVIRONMENT" != "" ]; then
     environment="--environment $VESPA_ENVIRONMENT"
@@ -85,6 +86,6 @@ fi
 
 defaults="--tenant default --application default --instance default"
 jvmoptions="-XX:MaxJavaStackTraceDepth=1000000 $(getJavaOptionsIPV46) -Xms48m -Xmx48m"
-jar="-cp $VESPA_HOME/lib/jars/filedistribution-jar-with-dependencies.jar"
+jar="-cp ${VESPA_HOME}/lib/jars/filedistribution-jar-with-dependencies.jar"
 
 exec java $jvmoptions $jar com.yahoo.vespa.filedistribution.status.FileDistributionStatusClient $defaults $environment $region "$@"
diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh
index 72b31280106..d37a2f31720 100755
--- a/logserver/bin/logserver-start.sh
+++ b/logserver/bin/logserver-start.sh
@@ -72,11 +72,12 @@ 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; }
 
 heap_min=32
 heap_max=256
@@ -84,7 +85,7 @@ addopts="-server -Xms${heap_min}m -Xmx${heap_max}m -XX:+PreserveFramePointer $(g
 
 oomopt="-XX:+ExitOnOutOfMemoryError"
 
-jar="-jar $ROOT/lib/jars/logserver-jar-with-dependencies.jar"
+jar="-jar ${VESPA_HOME}/lib/jars/logserver-jar-with-dependencies.jar"
 
 export MALLOC_ARENA_MAX=1 #Does not need fast allocation
 
diff --git a/metrics-proxy/src/main/sh/start-telegraf.sh b/metrics-proxy/src/main/sh/start-telegraf.sh
index 0cdfd784367..60677e9f065 100644
--- a/metrics-proxy/src/main/sh/start-telegraf.sh
+++ b/metrics-proxy/src/main/sh/start-telegraf.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 fixddir () {
diff --git a/metrics-proxy/src/main/sh/stop-telegraf.sh b/metrics-proxy/src/main/sh/stop-telegraf.sh
index 3fb8ed2fe5b..595e4068ee5 100644
--- a/metrics-proxy/src/main/sh/stop-telegraf.sh
+++ b/metrics-proxy/src/main/sh/stop-telegraf.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 pidfile="${VESPA_HOME}/var/run/telegraf.pid"
diff --git a/node-admin/src/main/sh/node-admin.sh b/node-admin/src/main/sh/node-admin.sh
index c239afc39e1..8545d297ac1 100755
--- a/node-admin/src/main/sh/node-admin.sh
+++ b/node-admin/src/main/sh/node-admin.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 Usage() {
diff --git a/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh b/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh
index a326616fe30..1a169428f24 100755
--- a/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh
+++ b/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh
@@ -72,10 +72,12 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-ROOT=${VESPA_HOME%/}
-cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; }
+cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
 
 usage() {
     (
diff --git a/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh b/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh
index 48d709da36c..ede7058ef91 100755
--- a/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh
+++ b/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 LJ=${VESPA_HOME}/lib/jars
diff --git a/searchlib/src/main/sh/vespa-gbdt-converter b/searchlib/src/main/sh/vespa-gbdt-converter
index 54f611aa292..ed50871175b 100755
--- a/searchlib/src/main/sh/vespa-gbdt-converter
+++ b/searchlib/src/main/sh/vespa-gbdt-converter
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-exec java -cp $VESPA_HOME/lib/jars/searchlib.jar:$VESPA_HOME/lib/jars/document.jar:$VESPA_HOME/lib/jars/vespajlib.jar com.yahoo.searchlib.gbdt.GbdtConverter "$@"
+exec java -cp ${VESPA_HOME}/lib/jars/searchlib.jar:${VESPA_HOME}/lib/jars/document.jar:${VESPA_HOME}/lib/jars/vespajlib.jar com.yahoo.searchlib.gbdt.GbdtConverter "$@"
diff --git a/searchlib/src/main/sh/vespa-treenet-converter b/searchlib/src/main/sh/vespa-treenet-converter
index a8212ec187b..8a70562aaaf 100755
--- a/searchlib/src/main/sh/vespa-treenet-converter
+++ b/searchlib/src/main/sh/vespa-treenet-converter
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 exec java -cp $VESPA_HOME/lib/jars/searchlib.jar:$VESPA_HOME/lib/jars/document.jar:$VESPA_HOME/lib/jars/vespajlib.jar com.yahoo.searchlib.treenet.TreeNetConverter "$@"
diff --git a/security-tools/src/main/sh/vespa-curl-wrapper b/security-tools/src/main/sh/vespa-curl-wrapper
index a6327f3be92..9381d6f898b 100755
--- a/security-tools/src/main/sh/vespa-curl-wrapper
+++ b/security-tools/src/main/sh/vespa-curl-wrapper
@@ -75,11 +75,14 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 set -e
 
-eval $($VESPA_HOME/libexec/vespa/script-utils security-env)
+eval $(${VESPA_HOME}/libexec/vespa/script-utils security-env)
 
 CURL_PARAMETERS=("$@")
 
diff --git a/security-tools/src/main/sh/vespa-security-env b/security-tools/src/main/sh/vespa-security-env
index 5661907ac5d..b8f972653d6 100755
--- a/security-tools/src/main/sh/vespa-security-env
+++ b/security-tools/src/main/sh/vespa-security-env
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 exec java -Djava.awt.headless=true -cp ${VESPA_HOME}/lib/jars/security-tools-jar-with-dependencies.jar com.yahoo.vespa.security.tool.securityenv.Main "$@"
diff --git a/standalone-container/src/main/sh/standalone-container.sh b/standalone-container/src/main/sh/standalone-container.sh
index f55a6df5b76..9a780f29c86 100755
--- a/standalone-container/src/main/sh/standalone-container.sh
+++ b/standalone-container/src/main/sh/standalone-container.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 Usage() {
@@ -120,7 +123,7 @@ StartCommand() {
         Fail "Service must match regex '$service_regex'"
     fi
 
-    local pidfile="$VESPA_HOME/var/run/$service.pid"
+    local pidfile="${VESPA_HOME}/var/run/$service.pid"
     if [ "$force" = false ] && test -r "$pidfile"; then
         echo "$service is already running as PID $(< "$pidfile") according to $pidfile"
         return
@@ -130,11 +133,11 @@ StartCommand() {
     export VESPA_SERVICE_NAME="$service"
 
     # stuff for the process:
-    local appdir="$VESPA_HOME/conf/$service-app"
-    local cfpfile="$VESPA_HOME/var/jdisc_container/$service.properties"
-    local bundlecachedir="$VESPA_HOME/var/vespa/bundlecache/$service"
+    local appdir="${VESPA_HOME}/conf/$service-app"
+    local cfpfile="${VESPA_HOME}/var/jdisc_container/$service.properties"
+    local bundlecachedir="${VESPA_HOME}/var/vespa/bundlecache/$service"
 
-    cd "$VESPA_HOME" || Fail "Cannot cd to $VESPA_HOME"
+    cd "${VESPA_HOME}" || Fail "Cannot cd to ${VESPA_HOME}"
 
     fixlimits
 
@@ -145,11 +148,11 @@ StartCommand() {
 
     FixDataDirectory "$(dirname "$pidfile")"
 
-    local vespa_log="$VESPA_HOME/logs/vespa/vespa.log"
+    local vespa_log="${VESPA_HOME}/logs/vespa/vespa.log"
     export VESPA_LOG_TARGET="file:$vespa_log"
     FixDataDirectory "$(dirname "$vespa_log")"
 
-    export VESPA_LOG_CONTROL_FILE="$VESPA_HOME/var/db/vespa/logcontrol/$service.logcontrol"
+    export VESPA_LOG_CONTROL_FILE="${VESPA_HOME}/var/db/vespa/logcontrol/$service.logcontrol"
     export VESPA_LOG_CONTROL_DIR="$(dirname "$VESPA_LOG_CONTROL_FILE")"
     FixDataDirectory "$VESPA_LOG_CONTROL_DIR"
 
@@ -160,12 +163,12 @@ StartCommand() {
     export standalone_jdisc_container__app_location="$appdir"
 
     # class path
-    CP="$VESPA_HOME/lib/jars/jdisc_core-jar-with-dependencies.jar"
+    CP="${VESPA_HOME}/lib/jars/jdisc_core-jar-with-dependencies.jar"
 
     FixDataDirectory "$(dirname "$cfpfile")"
     printenv > "$cfpfile"
     FixDataDirectory "$bundlecachedir"
-    FixDataDirectory "$VESPA_HOME/var/crash"
+    FixDataDirectory "${VESPA_HOME}/var/crash"
 
     heap_min=$(get_min_heap_mb "${jvm_arguments}" 128)
     heap_max=$(get_max_heap_mb "${jvm_arguments}" 2048)
@@ -174,7 +177,7 @@ StartCommand() {
         -XX:+PreserveFramePointer \
         $(get_jvm_hugepage_settings $heap_max) \
         -XX:+HeapDumpOnOutOfMemoryError \
-        -XX:HeapDumpPath="$VESPA_HOME/var/crash" \
+        -XX:HeapDumpPath="${VESPA_HOME}/var/crash" \
         -XX:+ExitOnOutOfMemoryError \
         --add-opens=java.base/java.io=ALL-UNNAMED \
         --add-opens=java.base/java.lang=ALL-UNNAMED \
@@ -182,7 +185,7 @@ StartCommand() {
         --add-opens=java.base/java.nio=ALL-UNNAMED \
         --add-opens=java.base/jdk.internal.loader=ALL-UNNAMED \
         --add-opens=java.base/sun.security.ssl=ALL-UNNAMED  \
-        -Djava.library.path="$VESPA_HOME/lib64" \
+        -Djava.library.path="${VESPA_HOME}/lib64" \
         -Djava.security.properties=${VESPA_HOME}/conf/vespa/java.security.override \
         -Djava.awt.headless=true \
         -Dsun.rmi.dgc.client.gcInterval=3600000 \
@@ -193,7 +196,7 @@ StartCommand() {
         -Djdisc.config.file="$cfpfile" \
         -Djdisc.export.packages= \
         -Djdisc.cache.path="$bundlecachedir" \
-        -Djdisc.bundle.path="$VESPA_HOME/lib/jars" \
+        -Djdisc.bundle.path="${VESPA_HOME}/lib/jars" \
         -Djdisc.logger.enabled=false \
         -Djdisc.logger.level=WARNING \
         -Djdisc.logger.tag="$service" \
@@ -270,7 +273,7 @@ StopCommand() {
     local service="$2"
     local force="$3"
 
-    local pidfile="$VESPA_HOME/var/run/$service.pid"
+    local pidfile="${VESPA_HOME}/var/run/$service.pid"
     if ! test -r "$pidfile"; then
         echo "$service is not running"
         return
diff --git a/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh b/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh
index 6e9aefd56c7..dc6240cc79f 100755
--- a/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh
+++ b/vespa-feed-client-cli/src/main/sh/vespa-feed-client.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 export MALLOC_ARENA_MAX=1 #Does not need fast allocation
diff --git a/vespa_feed_perf/src/main/sh/vespa-feed-perf b/vespa_feed_perf/src/main/sh/vespa-feed-perf
index d890497b25c..f8d94df3929 100755
--- a/vespa_feed_perf/src/main/sh/vespa-feed-perf
+++ b/vespa_feed_perf/src/main/sh/vespa-feed-perf
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-exec java -XX:+UseParallelGC -XX:ParallelGCThreads=4 -jar $VESPA_HOME/lib/jars/vespa_feed_perf-jar-with-dependencies.jar "$@"
+exec java -XX:+UseParallelGC -XX:ParallelGCThreads=4 -jar ${VESPA_HOME}/lib/jars/vespa_feed_perf-jar-with-dependencies.jar "$@"
diff --git a/vespabase/src/rhel-prestart.sh b/vespabase/src/rhel-prestart.sh
index 9a9b0777596..d6f53046b47 100755
--- a/vespabase/src/rhel-prestart.sh
+++ b/vespabase/src/rhel-prestart.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 [ "$VESPA_HOME" ] || { echo "Missing VESPA_HOME variable" 1>&2; exit 1; }
@@ -87,7 +90,7 @@ if [ "$VESPA_GROUP" = "" ]; then
 fi
 IS_ROOT=$([ "$(id -ru)" == "0" ] && echo true || echo false)
 
-cd $VESPA_HOME || { echo "Cannot cd to $VESPA_HOME" 1>&2; exit 1; }
+cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
 
 fixdir () {
     if [ $# != 4 ]; then
@@ -100,11 +103,11 @@ fixdir () {
         local user=${stat% *}
         local group=${stat#* }
         if [ "$1" != "$user" ]; then
-            echo "Wrong owner for $VESPA_HOME/$4, expected $1, was $user"
+            echo "Wrong owner for ${VESPA_HOME}/$4, expected $1, was $user"
             exit 1
         fi
         if [ "$2" != "$group" ]; then
-            echo "Wrong group for $VESPA_HOME/$4, expected $2, was $group"
+            echo "Wrong group for ${VESPA_HOME}/$4, expected $2, was $group"
             exit 1
         fi
     else
diff --git a/vespabase/src/start-cbinaries.sh b/vespabase/src/start-cbinaries.sh
index 6a6720e7d9c..38c081481a6 100755
--- a/vespabase/src/start-cbinaries.sh
+++ b/vespabase/src/start-cbinaries.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 bname=`basename $0`
@@ -99,7 +102,7 @@ configure_valgrind () {
     if which valgrind >/dev/null 2>&1; then
         if check_bname_in_value "$VESPA_USE_VALGRIND"; then
             no_valgrind=false
-            valgrind_log=$VESPA_HOME/tmp/valgrind.$bname.log.$$
+            valgrind_log=${VESPA_HOME}/tmp/valgrind.$bname.log.$$
             case $VESPA_VALGRIND_OPT in
                 *callgrind*) use_callgrind=true;;
             esac
diff --git a/vespabase/src/start-tool.sh b/vespabase/src/start-tool.sh
index 6e04db7450e..a7845f6d623 100755
--- a/vespabase/src/start-tool.sh
+++ b/vespabase/src/start-tool.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 use_configserver_if_needed
diff --git a/vespabase/src/start-vespa-base.sh b/vespabase/src/start-vespa-base.sh
index 345009e0127..889a9f0298b 100755
--- a/vespabase/src/start-vespa-base.sh
+++ b/vespabase/src/start-vespa-base.sh
@@ -72,9 +72,12 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-cd $VESPA_HOME || { echo "Cannot cd to $VESPA_HOME" 1>&2; exit 1; }
+cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
 
 fixlimits
 checkjava
diff --git a/vespabase/src/stop-vespa-base.sh b/vespabase/src/stop-vespa-base.sh
index f6dacf32076..6e699758259 100755
--- a/vespabase/src/stop-vespa-base.sh
+++ b/vespabase/src/stop-vespa-base.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 cd ${VESPA_HOME} || { echo "Cannot cd to ${VESPA_HOME}" 1>&2; exit 1; }
diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh
index 8bdfc9560df..7927422ba9c 100755
--- a/vespabase/src/vespa-start-configserver.sh
+++ b/vespabase/src/vespa-start-configserver.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 ${VESPA_HOME}/bin/vespa-prestart.sh || exit 1
diff --git a/vespabase/src/vespa-start-services.sh b/vespabase/src/vespa-start-services.sh
index 9e79f9ae961..6dbd0eefa83 100755
--- a/vespabase/src/vespa-start-services.sh
+++ b/vespabase/src/vespa-start-services.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 ${VESPA_HOME}/bin/vespa-prestart.sh || exit 1
diff --git a/vespabase/src/vespa-stop-configserver.sh b/vespabase/src/vespa-stop-configserver.sh
index 71e07b0a384..8c51509160e 100755
--- a/vespabase/src/vespa-stop-configserver.sh
+++ b/vespabase/src/vespa-stop-configserver.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 willrun=${VESPA_HOME}/libexec/vespa/stop-configserver
diff --git a/vespabase/src/vespa-stop-services.sh b/vespabase/src/vespa-stop-services.sh
index 7c355e07575..167d86af853 100755
--- a/vespabase/src/vespa-stop-services.sh
+++ b/vespabase/src/vespa-stop-services.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 willrun=${VESPA_HOME}/libexec/vespa/stop-vespa-base.sh
diff --git a/vespaclient-java/src/main/sh/vespa-destination.sh b/vespaclient-java/src/main/sh/vespa-destination.sh
index 1e13a37f0dd..597f79134b8 100755
--- a/vespaclient-java/src/main/sh/vespa-destination.sh
+++ b/vespaclient-java/src/main/sh/vespa-destination.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 export MALLOC_ARENA_MAX=1 #Does not need fast allocation
diff --git a/vespaclient-java/src/main/sh/vespa-document-statistics.sh b/vespaclient-java/src/main/sh/vespa-document-statistics.sh
index 0dbeabf5f35..0e7f5074eae 100755
--- a/vespaclient-java/src/main/sh/vespa-document-statistics.sh
+++ b/vespaclient-java/src/main/sh/vespa-document-statistics.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 function help {
diff --git a/vespaclient-java/src/main/sh/vespa-feeder.sh b/vespaclient-java/src/main/sh/vespa-feeder.sh
index 1572ba804fe..7dcbb9fc1e8 100755
--- a/vespaclient-java/src/main/sh/vespa-feeder.sh
+++ b/vespaclient-java/src/main/sh/vespa-feeder.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 export VESPA_LOG_TARGET=file:/dev/null
diff --git a/vespaclient-java/src/main/sh/vespa-get.sh b/vespaclient-java/src/main/sh/vespa-get.sh
index 6aebfa4fde1..1d19bd9039b 100644
--- a/vespaclient-java/src/main/sh/vespa-get.sh
+++ b/vespaclient-java/src/main/sh/vespa-get.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 export MALLOC_ARENA_MAX=1 #Does not need fast allocation
diff --git a/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh b/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh
index 4c68bf8a3ce..f0a50574dee 100755
--- a/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh
+++ b/vespaclient-java/src/main/sh/vespa-query-profile-dump-tool.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 java $(getJavaOptionsIPV46) -cp ${VESPA_HOME}/lib/jars/vespaclient-java-jar-with-dependencies.jar com.yahoo.search.query.profile.DumpTool $@
diff --git a/vespaclient-java/src/main/sh/vespa-stat.sh b/vespaclient-java/src/main/sh/vespa-stat.sh
index 3aaadff16ae..c1380ed25ac 100644
--- a/vespaclient-java/src/main/sh/vespa-stat.sh
+++ b/vespaclient-java/src/main/sh/vespa-stat.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 export MALLOC_ARENA_MAX=1 #Does not need fast allocation
diff --git a/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh
index 9a85cf00aa5..1a193c17a55 100755
--- a/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh
+++ b/vespaclient-java/src/main/sh/vespa-summary-benchmark.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 export VESPA_LOG_TARGET=file:/dev/null
diff --git a/vespaclient-java/src/main/sh/vespa-visit-target.sh b/vespaclient-java/src/main/sh/vespa-visit-target.sh
index 906011a373a..9f72d89cb3f 100755
--- a/vespaclient-java/src/main/sh/vespa-visit-target.sh
+++ b/vespaclient-java/src/main/sh/vespa-visit-target.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 export MALLOC_ARENA_MAX=1 #Does not need fast allocation
diff --git a/vespaclient-java/src/main/sh/vespa-visit.sh b/vespaclient-java/src/main/sh/vespa-visit.sh
index 06c79ee8127..8fd0f0fd308 100755
--- a/vespaclient-java/src/main/sh/vespa-visit.sh
+++ b/vespaclient-java/src/main/sh/vespa-visit.sh
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 Xmx="-Xmx1024m"
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkcat b/zookeeper-command-line-client/src/main/sh/vespa-zkcat
index 425fd06171f..53e55f296a7 100755
--- a/zookeeper-command-line-client/src/main/sh/vespa-zkcat
+++ b/zookeeper-command-line-client/src/main/sh/vespa-zkcat
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-$VESPA_HOME/bin/vespa-zkctl get $@
+${VESPA_HOME}/bin/vespa-zkctl get $@
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkcli b/zookeeper-command-line-client/src/main/sh/vespa-zkcli
index bab29218207..66c496b0d29 100755
--- a/zookeeper-command-line-client/src/main/sh/vespa-zkcli
+++ b/zookeeper-command-line-client/src/main/sh/vespa-zkcli
@@ -72,8 +72,11 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-java -cp $VESPA_HOME/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \
+java -cp ${VESPA_HOME}/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \
      -Dlog4j.configuration="log4j-vespa.properties" -Xms32m -Xmx512m \
      com.yahoo.vespa.zookeeper.cli.Main "$@"
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkctl b/zookeeper-command-line-client/src/main/sh/vespa-zkctl
index 06d32848128..cf10c796d16 100755
--- a/zookeeper-command-line-client/src/main/sh/vespa-zkctl
+++ b/zookeeper-command-line-client/src/main/sh/vespa-zkctl
@@ -72,7 +72,10 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
 # Get rid of the interactive zkcli prompt by running it in a subshell
-(echo "$@" | $VESPA_HOME/bin/vespa-zkcli)
+(echo "$@" | ${VESPA_HOME}/bin/vespa-zkcli)
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkflw b/zookeeper-command-line-client/src/main/sh/vespa-zkflw
index f0619004579..5ae8ff5f7ac 100644
--- a/zookeeper-command-line-client/src/main/sh/vespa-zkflw
+++ b/zookeeper-command-line-client/src/main/sh/vespa-zkflw
@@ -72,8 +72,11 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-java -cp $VESPA_HOME/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \
+java -cp ${VESPA_HOME}/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \
      -Dlog4j.configuration="log4j-vespa.properties" -Xms32m -Xmx512m \
      com.yahoo.vespa.zookeeper.cli.FourLetterWordMain "$@"
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkls b/zookeeper-command-line-client/src/main/sh/vespa-zkls
index dca81c55831..6d3fa3a1873 100755
--- a/zookeeper-command-line-client/src/main/sh/vespa-zkls
+++ b/zookeeper-command-line-client/src/main/sh/vespa-zkls
@@ -72,6 +72,9 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-$VESPA_HOME/bin/vespa-zkctl ls $@
+${VESPA_HOME}/bin/vespa-zkctl ls $@
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zktxnlog b/zookeeper-command-line-client/src/main/sh/vespa-zktxnlog
index f6868c76906..78ec7a1f126 100755
--- a/zookeeper-command-line-client/src/main/sh/vespa-zktxnlog
+++ b/zookeeper-command-line-client/src/main/sh/vespa-zktxnlog
@@ -72,8 +72,11 @@ findhost () {
 findroot
 findhost
 
+ROOT=${VESPA_HOME%/}
+export ROOT
+
 # END environment bootstrap section
 
-java -cp $VESPA_HOME/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \
+java -cp ${VESPA_HOME}/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \
      -Xms32m -Xmx512m \
      org.apache.zookeeper.server.persistence.TxnLogToolkit "$@"