diff options
| author | Arne Juul <arnej@yahooinc.com> | 2022-10-24 10:02:58 +0000 |
|---|---|---|
| committer | Arne Juul <arnej@yahooinc.com> | 2022-10-24 10:02:58 +0000 |
| commit | 1417a48bd4aecfb5e182d6c7b81960e3d7232309 (patch) | |
| tree | 256cff43ab30ea2c5efbe31c9d1ad7eb316eefea /security-tools | |
| parent | fa29e75a71b49fc3925349457bb43de03b6d60d8 (diff) | |
* apply new common bootstrap
* remove now-duplicated code
* prefer using ${VESPA_HOME} environment variable
Diffstat (limited to 'security-tools')
| -rwxr-xr-x | security-tools/src/main/sh/vespa-curl-wrapper | 5 | ||||
| -rwxr-xr-x | security-tools/src/main/sh/vespa-security-env | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/security-tools/src/main/sh/vespa-curl-wrapper b/security-tools/src/main/sh/vespa-curl-wrapper index a6327f3be92..9381d6f898b 100755 --- a/security-tools/src/main/sh/vespa-curl-wrapper +++ b/security-tools/src/main/sh/vespa-curl-wrapper @@ -75,11 +75,14 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section set -e -eval $($VESPA_HOME/libexec/vespa/script-utils security-env) +eval $(${VESPA_HOME}/libexec/vespa/script-utils security-env) CURL_PARAMETERS=("$@") diff --git a/security-tools/src/main/sh/vespa-security-env b/security-tools/src/main/sh/vespa-security-env index 5661907ac5d..b8f972653d6 100755 --- a/security-tools/src/main/sh/vespa-security-env +++ b/security-tools/src/main/sh/vespa-security-env @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # 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 "$@" |