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 /searchlib | |
| parent | fa29e75a71b49fc3925349457bb43de03b6d60d8 (diff) | |
* apply new common bootstrap
* remove now-duplicated code
* prefer using ${VESPA_HOME} environment variable
Diffstat (limited to 'searchlib')
| -rwxr-xr-x | searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh | 3 | ||||
| -rwxr-xr-x | searchlib/src/main/sh/vespa-gbdt-converter | 5 | ||||
| -rwxr-xr-x | searchlib/src/main/sh/vespa-treenet-converter | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh b/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh index 48d709da36c..ede7058ef91 100755 --- a/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh +++ b/searchlib/src/main/sh/vespa-evaluate-tensor-conformance.sh @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section LJ=${VESPA_HOME}/lib/jars diff --git a/searchlib/src/main/sh/vespa-gbdt-converter b/searchlib/src/main/sh/vespa-gbdt-converter index 54f611aa292..ed50871175b 100755 --- a/searchlib/src/main/sh/vespa-gbdt-converter +++ b/searchlib/src/main/sh/vespa-gbdt-converter @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section -exec java -cp $VESPA_HOME/lib/jars/searchlib.jar:$VESPA_HOME/lib/jars/document.jar:$VESPA_HOME/lib/jars/vespajlib.jar com.yahoo.searchlib.gbdt.GbdtConverter "$@" +exec java -cp ${VESPA_HOME}/lib/jars/searchlib.jar:${VESPA_HOME}/lib/jars/document.jar:${VESPA_HOME}/lib/jars/vespajlib.jar com.yahoo.searchlib.gbdt.GbdtConverter "$@" diff --git a/searchlib/src/main/sh/vespa-treenet-converter b/searchlib/src/main/sh/vespa-treenet-converter index a8212ec187b..8a70562aaaf 100755 --- a/searchlib/src/main/sh/vespa-treenet-converter +++ b/searchlib/src/main/sh/vespa-treenet-converter @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section exec java -cp $VESPA_HOME/lib/jars/searchlib.jar:$VESPA_HOME/lib/jars/document.jar:$VESPA_HOME/lib/jars/vespajlib.jar com.yahoo.searchlib.treenet.TreeNetConverter "$@" |