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 /zkfacade | |
| 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 'zkfacade')
| -rwxr-xr-x | zkfacade/src/main/sh/zkcat | 2 | ||||
| -rwxr-xr-x | zkfacade/src/main/sh/zkcli | 2 | ||||
| -rwxr-xr-x | zkfacade/src/main/sh/zkctl | 2 | ||||
| -rwxr-xr-x | zkfacade/src/main/sh/zkls | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/zkfacade/src/main/sh/zkcat b/zkfacade/src/main/sh/zkcat index dd4adaa25d7..2504b77d085 100755 --- a/zkfacade/src/main/sh/zkcat +++ b/zkfacade/src/main/sh/zkcat @@ -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 diff --git a/zkfacade/src/main/sh/zkcli b/zkfacade/src/main/sh/zkcli index 6e276a83128..e2c7f66644a 100755 --- a/zkfacade/src/main/sh/zkcli +++ b/zkfacade/src/main/sh/zkcli @@ -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 diff --git a/zkfacade/src/main/sh/zkctl b/zkfacade/src/main/sh/zkctl index 69b29cc055f..d1234de26f1 100755 --- a/zkfacade/src/main/sh/zkctl +++ b/zkfacade/src/main/sh/zkctl @@ -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 diff --git a/zkfacade/src/main/sh/zkls b/zkfacade/src/main/sh/zkls index ac445d613cc..ccd2e546252 100755 --- a/zkfacade/src/main/sh/zkls +++ b/zkfacade/src/main/sh/zkls @@ -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 |