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 /configserver | |
| parent | 25809a32e2a9227d92e355483984e9ba592358f4 (diff) | |
avoid trailing slash in ROOT setting
Diffstat (limited to 'configserver')
| -rwxr-xr-x | configserver/src/main/sh/cloudconfig_server-remove-state | 2 | ||||
| -rwxr-xr-x | configserver/src/main/sh/start-filedistribution | 2 | ||||
| -rw-r--r-- | configserver/src/main/sh/start-logd | 2 | ||||
| -rwxr-xr-x | configserver/src/main/sh/stop-configserver | 2 |
4 files changed, 4 insertions, 4 deletions
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; } |