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-model | |
| 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-model')
| -rwxr-xr-x | config-model/src/main/perl/vespa-deploy | 2 | ||||
| -rwxr-xr-x | config-model/src/main/sh/vespa-validate-application | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/config-model/src/main/perl/vespa-deploy b/config-model/src/main/perl/vespa-deploy index 844d59f7993..d0b30803611 100755 --- a/config-model/src/main/perl/vespa-deploy +++ b/config-model/src/main/perl/vespa-deploy @@ -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-model/src/main/sh/vespa-validate-application b/config-model/src/main/sh/vespa-validate-application index 91f2caffa7c..6bbd5bd9976 100755 --- a/config-model/src/main/sh/vespa-validate-application +++ b/config-model/src/main/sh/vespa-validate-application @@ -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 |