summaryrefslogtreecommitdiffstats
path: root/config-proxy
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-06-13 08:53:09 +0200
committerArne H Juul <arnej@yahoo-inc.com>2017-06-17 15:34:13 +0200
commit26dcbb4f3081a4ef544f5ff53cf1c969cab17496 (patch)
tree74465f040fb36fec69284b0c51e4c00be9436113 /config-proxy
parenta0e1c22870d39fdf8746c446b6206307832666eb (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 'config-proxy')
-rwxr-xr-xconfig-proxy/src/main/sh/vespa-config-ctl2
-rw-r--r--config-proxy/src/main/sh/vespa-config-loadtester2
-rw-r--r--config-proxy/src/main/sh/vespa-config-verification2
3 files changed, 0 insertions, 6 deletions
diff --git a/config-proxy/src/main/sh/vespa-config-ctl b/config-proxy/src/main/sh/vespa-config-ctl
index abd9ddd74f7..4b71805e8d8 100755
--- a/config-proxy/src/main/sh/vespa-config-ctl
+++ b/config-proxy/src/main/sh/vespa-config-ctl
@@ -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/config-proxy/src/main/sh/vespa-config-loadtester b/config-proxy/src/main/sh/vespa-config-loadtester
index 93ca15bd78c..fc0a33d8d49 100644
--- a/config-proxy/src/main/sh/vespa-config-loadtester
+++ b/config-proxy/src/main/sh/vespa-config-loadtester
@@ -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/config-proxy/src/main/sh/vespa-config-verification b/config-proxy/src/main/sh/vespa-config-verification
index 29083cc16e8..52174495ee3 100644
--- a/config-proxy/src/main/sh/vespa-config-verification
+++ b/config-proxy/src/main/sh/vespa-config-verification
@@ -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