summaryrefslogtreecommitdiffstats
path: root/security-tools
diff options
context:
space:
mode:
Diffstat (limited to 'security-tools')
-rwxr-xr-xsecurity-tools/src/main/sh/vespa-curl-wrapper4
-rwxr-xr-xsecurity-tools/src/main/sh/vespa-security-env5
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