From 3502b839bac19af14dec446aeabdffd10eb37897 Mon Sep 17 00:00:00 2001 From: Arne H Juul Date: Thu, 8 Jun 2017 13:26:46 +0200 Subject: avoid trailing slash in ROOT setting --- application-preprocessor/src/main/sh/vespa-preprocess-application | 2 +- clustercontroller-standalone/src/main/sh/fleetcontroller-start | 2 +- config-model/src/main/sh/validate-application | 2 +- config-proxy/src/main/sh/cloudconfig_loadtester | 2 +- config-proxy/src/main/sh/cloudconfig_verification | 2 +- config-proxy/src/main/sh/config-ctl | 2 +- config/src/apps/activate-application/activate-application.sh | 2 +- configserver/src/main/sh/cloudconfig_server-remove-state | 2 +- configserver/src/main/sh/start-filedistribution | 2 +- configserver/src/main/sh/start-logd | 2 +- configserver/src/main/sh/stop-configserver | 2 +- filedistribution/src/apps/status/vespa-status-filedistribution.sh | 2 +- logserver/bin/logserver-start.sh | 2 +- searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/application-preprocessor/src/main/sh/vespa-preprocess-application b/application-preprocessor/src/main/sh/vespa-preprocess-application index 68c7fa23d00..5bd78fb3e02 100644 --- a/application-preprocessor/src/main/sh/vespa-preprocess-application +++ b/application-preprocessor/src/main/sh/vespa-preprocess-application @@ -59,7 +59,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} export ROOT cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } diff --git a/clustercontroller-standalone/src/main/sh/fleetcontroller-start b/clustercontroller-standalone/src/main/sh/fleetcontroller-start index dda006ff7b1..8f8e07b8110 100755 --- a/clustercontroller-standalone/src/main/sh/fleetcontroller-start +++ b/clustercontroller-standalone/src/main/sh/fleetcontroller-start @@ -62,7 +62,7 @@ findroot JAR=lib/jars/clustercontroller-standalone-jar-with-dependencies.jar -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} export ROOT cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } diff --git a/config-model/src/main/sh/validate-application b/config-model/src/main/sh/validate-application index 3af983fbf3d..8fbcb98ea92 100755 --- a/config-model/src/main/sh/validate-application +++ b/config-model/src/main/sh/validate-application @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} export ROOT usage () { diff --git a/config-proxy/src/main/sh/cloudconfig_loadtester b/config-proxy/src/main/sh/cloudconfig_loadtester index 882f3af037b..6efe70d570a 100644 --- a/config-proxy/src/main/sh/cloudconfig_loadtester +++ b/config-proxy/src/main/sh/cloudconfig_loadtester @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} export ROOT echo "# Using CLASSPATH=$CLASSPATH, args=$@" diff --git a/config-proxy/src/main/sh/cloudconfig_verification b/config-proxy/src/main/sh/cloudconfig_verification index ba5504e95d9..0df2723cee5 100644 --- a/config-proxy/src/main/sh/cloudconfig_verification +++ b/config-proxy/src/main/sh/cloudconfig_verification @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} export ROOT echo "# Using CLASSPATH=$CLASSPATH, args=$@" diff --git a/config-proxy/src/main/sh/config-ctl b/config-proxy/src/main/sh/config-ctl index 4618cb24cbc..7221ff0ee27 100755 --- a/config-proxy/src/main/sh/config-ctl +++ b/config-proxy/src/main/sh/config-ctl @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} export ROOT cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } diff --git a/config/src/apps/activate-application/activate-application.sh b/config/src/apps/activate-application/activate-application.sh index 473b96574f4..45b90a04912 100644 --- a/config/src/apps/activate-application/activate-application.sh +++ b/config/src/apps/activate-application/activate-application.sh @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} printf "WARNING: activate-application is deprecated, use 'deploy activate' instead\n\n" diff --git a/configserver/src/main/sh/cloudconfig_server-remove-state b/configserver/src/main/sh/cloudconfig_server-remove-state index 3ec76aaea92..34ba240ffae 100755 --- a/configserver/src/main/sh/cloudconfig_server-remove-state +++ b/configserver/src/main/sh/cloudconfig_server-remove-state @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } usage() { diff --git a/configserver/src/main/sh/start-filedistribution b/configserver/src/main/sh/start-filedistribution index a62afce40b7..ecf04e9e035 100755 --- a/configserver/src/main/sh/start-filedistribution +++ b/configserver/src/main/sh/start-filedistribution @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} VESPA_CONFIG_ID="dir:${ROOT}/conf/filedistributor" export VESPA_CONFIG_ID diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index 4a797c1ce5c..3ad735d5183 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} export VESPA_CONFIG_ID="file:$VESPA_HOME/conf/logd/logd.cfg" diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver index 1d63a25fa0e..04867dd180e 100755 --- a/configserver/src/main/sh/stop-configserver +++ b/configserver/src/main/sh/stop-configserver @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} export ROOT cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } diff --git a/filedistribution/src/apps/status/vespa-status-filedistribution.sh b/filedistribution/src/apps/status/vespa-status-filedistribution.sh index d9add177b23..104688a4883 100644 --- a/filedistribution/src/apps/status/vespa-status-filedistribution.sh +++ b/filedistribution/src/apps/status/vespa-status-filedistribution.sh @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} ZKSTRING=$($ROOT/libexec/vespa/vespa-config.pl -zkstring) test -z "$VESPA_LOG_LEVEL" && VESPA_LOG_LEVEL=warning diff --git a/logserver/bin/logserver-start.sh b/logserver/bin/logserver-start.sh index 96dac54aafe..8355fb4e7da 100755 --- a/logserver/bin/logserver-start.sh +++ b/logserver/bin/logserver-start.sh @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} export ROOT cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } 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 d66a0e79bb2..250e3d2cf37 100755 --- a/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh +++ b/searchcore/src/apps/vespa-remove-indexes/vespa-remove-index.sh @@ -60,7 +60,7 @@ findroot # END environment bootstrap section -ROOT=$VESPA_HOME +ROOT=${VESPA_HOME%/} cd $ROOT || { echo "Cannot cd to $ROOT" 1>&2; exit 1; } usage() { -- cgit v1.2.3