diff options
| author | Arnstein Ressem <aressem@verizonmedia.com> | 2019-09-05 08:59:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-05 08:59:21 +0200 |
| commit | a092b17cecf36c9813ca8ba90ccdf9fb9602486a (patch) | |
| tree | acd446366bb34d87271795ad23fdce9491bf78a2 /configserver | |
| parent | a5902f682cfb98d02406a1ebcf44256627711ba8 (diff) | |
| parent | 1e333d6ee30b142be63f589d9a5d32bbc471b6fb (diff) | |
Merge pull request #10509 from vespa-engine/arnej/handle-relative-paths-to-start-script
update shell bootstrap sections
Diffstat (limited to 'configserver')
| -rwxr-xr-x | configserver/src/main/sh/start-configserver | 4 | ||||
| -rw-r--r-- | configserver/src/main/sh/start-logd | 4 | ||||
| -rwxr-xr-x | configserver/src/main/sh/stop-configserver | 4 | ||||
| -rwxr-xr-x | configserver/src/main/sh/vespa-configserver-remove-state | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/configserver/src/main/sh/start-configserver b/configserver/src/main/sh/start-configserver index 12683b1856a..4849b993340 100755 --- a/configserver/src/main/sh/start-configserver +++ b/configserver/src/main/sh/start-configserver @@ -8,6 +8,10 @@ findpath () { myname=${0} mypath=${myname%/*} myname=${myname##*/} + empty_if_start_slash=${mypath%%/*} + if [ "${empty_if_start_slash}" ]; then + mypath=$(pwd)/${mypath} + fi if [ "$mypath" ] && [ -d "$mypath" ]; then return fi diff --git a/configserver/src/main/sh/start-logd b/configserver/src/main/sh/start-logd index df5f6b00209..d8ed068537e 100644 --- a/configserver/src/main/sh/start-logd +++ b/configserver/src/main/sh/start-logd @@ -8,6 +8,10 @@ findpath () { myname=${0} mypath=${myname%/*} myname=${myname##*/} + empty_if_start_slash=${mypath%%/*} + if [ "${empty_if_start_slash}" ]; then + mypath=$(pwd)/${mypath} + fi if [ "$mypath" ] && [ -d "$mypath" ]; then return fi diff --git a/configserver/src/main/sh/stop-configserver b/configserver/src/main/sh/stop-configserver index 099429eb556..007ff7cdd62 100755 --- a/configserver/src/main/sh/stop-configserver +++ b/configserver/src/main/sh/stop-configserver @@ -8,6 +8,10 @@ findpath () { myname=${0} mypath=${myname%/*} myname=${myname##*/} + empty_if_start_slash=${mypath%%/*} + if [ "${empty_if_start_slash}" ]; then + mypath=$(pwd)/${mypath} + fi if [ "$mypath" ] && [ -d "$mypath" ]; then return fi diff --git a/configserver/src/main/sh/vespa-configserver-remove-state b/configserver/src/main/sh/vespa-configserver-remove-state index c5cee479388..4ac32f86a05 100755 --- a/configserver/src/main/sh/vespa-configserver-remove-state +++ b/configserver/src/main/sh/vespa-configserver-remove-state @@ -8,6 +8,10 @@ findpath () { myname=${0} mypath=${myname%/*} myname=${myname##*/} + empty_if_start_slash=${mypath%%/*} + if [ "${empty_if_start_slash}" ]; then + mypath=$(pwd)/${mypath} + fi if [ "$mypath" ] && [ -d "$mypath" ]; then return fi |