diff options
| author | Arne Juul <arnej@yahoo-inc.com> | 2019-09-04 13:30:35 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahoo-inc.com> | 2019-09-04 13:30:35 +0000 |
| commit | 1e333d6ee30b142be63f589d9a5d32bbc471b6fb (patch) | |
| tree | 6832b4bb5c50dad210614fb1663a9d6a29bf8219 /security-tools | |
| parent | d71937c4f9f3c7b69d6d39cbac1ccdce23df3abe (diff) | |
update shell bootstrap sections
Diffstat (limited to 'security-tools')
| -rwxr-xr-x | security-tools/src/main/sh/vespa-curl-wrapper | 4 | ||||
| -rwxr-xr-x | security-tools/src/main/sh/vespa-security-env | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/security-tools/src/main/sh/vespa-curl-wrapper b/security-tools/src/main/sh/vespa-curl-wrapper index 4c616b0fc4e..e286e121f64 100755 --- a/security-tools/src/main/sh/vespa-curl-wrapper +++ b/security-tools/src/main/sh/vespa-curl-wrapper @@ -11,6 +11,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/security-tools/src/main/sh/vespa-security-env b/security-tools/src/main/sh/vespa-security-env index 63d71920f99..4bebd797172 100755 --- a/security-tools/src/main/sh/vespa-security-env +++ b/security-tools/src/main/sh/vespa-security-env @@ -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 @@ -70,4 +74,3 @@ findhost # END environment bootstrap section -exec java -Djava.awt.headless=true -cp ${VESPA_HOME}/lib/jars/security-tools-jar-with-dependencies.jar com.yahoo.vespa.security.tool.securityenv.Main "$@"
\ No newline at end of file |