diff options
| author | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-08 13:26:46 +0200 |
|---|---|---|
| committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-08 13:26:46 +0200 |
| commit | 3502b839bac19af14dec446aeabdffd10eb37897 (patch) | |
| tree | 7179d6d6b4ea2c22dfb4859439d75855f898bd8f /config-proxy | |
| parent | 25809a32e2a9227d92e355483984e9ba592358f4 (diff) | |
avoid trailing slash in ROOT setting
Diffstat (limited to 'config-proxy')
| -rw-r--r-- | config-proxy/src/main/sh/cloudconfig_loadtester | 2 | ||||
| -rw-r--r-- | config-proxy/src/main/sh/cloudconfig_verification | 2 | ||||
| -rwxr-xr-x | config-proxy/src/main/sh/config-ctl | 2 |
3 files changed, 3 insertions, 3 deletions
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; } |