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 /config | |
| 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 'config')
| -rw-r--r-- | config/src/apps/vespa-activate-application/vespa-activate-application.sh | 2 | ||||
| -rwxr-xr-x | config/src/apps/vespa-config/vespa-config.pl | 2 | ||||
| -rw-r--r-- | config/src/vespa/config/common/configsystem.cpp | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/config/src/apps/vespa-activate-application/vespa-activate-application.sh b/config/src/apps/vespa-activate-application/vespa-activate-application.sh index 7ad59c7f060..5a1688424c8 100644 --- a/config/src/apps/vespa-activate-application/vespa-activate-application.sh +++ b/config/src/apps/vespa-activate-application/vespa-activate-application.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 diff --git a/config/src/apps/vespa-config/vespa-config.pl b/config/src/apps/vespa-config/vespa-config.pl index a17a106a80f..41a73ad913f 100755 --- a/config/src/apps/vespa-config/vespa-config.pl +++ b/config/src/apps/vespa-config/vespa-config.pl @@ -6,7 +6,6 @@ # BEGIN perl environment bootstrap section # Do not edit between here and END as this section should stay identical in all scripts -use warnings; use File::Basename; use File::Path; @@ -57,7 +56,6 @@ sub findhome { BEGIN { my $tmp = findhome(); - if ( $tmp !~ m{[/]$} ) { $tmp .= "/"; } $ENV{'VESPA_HOME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/config/src/vespa/config/common/configsystem.cpp b/config/src/vespa/config/common/configsystem.cpp index b7d1f32b143..ba604d04aee 100644 --- a/config/src/vespa/config/common/configsystem.cpp +++ b/config/src/vespa/config/common/configsystem.cpp @@ -12,7 +12,7 @@ namespace { vespalib::string getConfigProxyFileName() { vespalib::string root(vespa::Defaults::vespaHome()); - return root + "var/run/configproxy.pid"; + return root + "/var/run/configproxy.pid"; } } |