diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-13 08:53:09 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-06-17 15:34:13 +0200 |
commit | 26dcbb4f3081a4ef544f5ff53cf1c969cab17496 (patch) | |
tree | 74465f040fb36fec69284b0c51e4c00be9436113 /vespabase/src/vespa-start-configserver.sh | |
parent | a0e1c22870d39fdf8746c446b6206307832666eb (diff) |
VESPA_HOME should not end with / anymore
* best practice for HOME-like env vars is to be just
the name of the directory without trailing slash.
Diffstat (limited to 'vespabase/src/vespa-start-configserver.sh')
-rwxr-xr-x | vespabase/src/vespa-start-configserver.sh | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vespabase/src/vespa-start-configserver.sh b/vespabase/src/vespa-start-configserver.sh index 2882efce2fa..cba6cbfd740 100755 --- a/vespabase/src/vespa-start-configserver.sh +++ b/vespabase/src/vespa-start-configserver.sh @@ -23,8 +23,6 @@ COMMON_ENV=libexec/vespa/common-env.sh source_common_env () { if [ "$VESPA_HOME" ] && [ -d "$VESPA_HOME" ]; then - # ensure it ends with "/" : - VESPA_HOME=${VESPA_HOME%/}/ export VESPA_HOME common_env=$VESPA_HOME/$COMMON_ENV if [ -f "$common_env" ]; then @@ -60,8 +58,8 @@ findroot # END environment bootstrap section -${VESPA_HOME}bin/vespa-prestart.sh || exit 1 -willrun=${VESPA_HOME}libexec/vespa/start-configserver +${VESPA_HOME}/bin/vespa-prestart.sh || exit 1 +willrun=${VESPA_HOME}/libexec/vespa/start-configserver if [ -x $willrun ]; then echo "Starting $willrun as a background process." >&2 exec </dev/null |