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 /vespaclient | |
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 'vespaclient')
-rwxr-xr-x | vespaclient/src/perl/bin/GetClusterState.pl | 2 | ||||
-rwxr-xr-x | vespaclient/src/perl/bin/GetNodeState.pl | 2 | ||||
-rwxr-xr-x | vespaclient/src/perl/bin/SetNodeState.pl | 2 | ||||
-rw-r--r-- | vespaclient/src/vespa/vespaclient/spoolmaster/application.cpp | 4 |
4 files changed, 2 insertions, 8 deletions
diff --git a/vespaclient/src/perl/bin/GetClusterState.pl b/vespaclient/src/perl/bin/GetClusterState.pl index d95d2b58b9d..6dd36d9e131 100755 --- a/vespaclient/src/perl/bin/GetClusterState.pl +++ b/vespaclient/src/perl/bin/GetClusterState.pl @@ -4,7 +4,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; @@ -55,7 +54,6 @@ sub findhome { BEGIN { my $tmp = findhome(); - if ( $tmp !~ m{[/]$} ) { $tmp .= "/"; } $ENV{'VESPA_HOME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/vespaclient/src/perl/bin/GetNodeState.pl b/vespaclient/src/perl/bin/GetNodeState.pl index 4728bc6b524..f7ac5a24918 100755 --- a/vespaclient/src/perl/bin/GetNodeState.pl +++ b/vespaclient/src/perl/bin/GetNodeState.pl @@ -4,7 +4,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; @@ -55,7 +54,6 @@ sub findhome { BEGIN { my $tmp = findhome(); - if ( $tmp !~ m{[/]$} ) { $tmp .= "/"; } $ENV{'VESPA_HOME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/vespaclient/src/perl/bin/SetNodeState.pl b/vespaclient/src/perl/bin/SetNodeState.pl index e807c86d772..f5df40a2433 100755 --- a/vespaclient/src/perl/bin/SetNodeState.pl +++ b/vespaclient/src/perl/bin/SetNodeState.pl @@ -4,7 +4,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; @@ -55,7 +54,6 @@ sub findhome { BEGIN { my $tmp = findhome(); - if ( $tmp !~ m{[/]$} ) { $tmp .= "/"; } $ENV{'VESPA_HOME'} = $tmp; } my $VESPA_HOME = $ENV{'VESPA_HOME'}; diff --git a/vespaclient/src/vespa/vespaclient/spoolmaster/application.cpp b/vespaclient/src/vespa/vespaclient/spoolmaster/application.cpp index 8c9dc9f65e2..0220f196185 100644 --- a/vespaclient/src/vespa/vespaclient/spoolmaster/application.cpp +++ b/vespaclient/src/vespa/vespaclient/spoolmaster/application.cpp @@ -12,13 +12,13 @@ namespace { std::string masterInbox() { std::string dir = vespa::Defaults::vespaHome(); - dir.append("var/spool/master/inbox"); + dir.append("/var/spool/master/inbox"); return dir; } std::string outboxParent() { std::string dir = vespa::Defaults::vespaHome(); - dir.append("var/spool/vespa"); + dir.append("/var/spool/vespa"); return dir; } |