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 /zookeeper-command-line-client | |
| parent | fa29e75a71b49fc3925349457bb43de03b6d60d8 (diff) | |
* apply new common bootstrap
* remove now-duplicated code
* prefer using ${VESPA_HOME} environment variable
Diffstat (limited to 'zookeeper-command-line-client')
6 files changed, 24 insertions, 6 deletions
diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkcat b/zookeeper-command-line-client/src/main/sh/vespa-zkcat index 425fd06171f..53e55f296a7 100755 --- a/zookeeper-command-line-client/src/main/sh/vespa-zkcat +++ b/zookeeper-command-line-client/src/main/sh/vespa-zkcat @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section -$VESPA_HOME/bin/vespa-zkctl get $@ +${VESPA_HOME}/bin/vespa-zkctl get $@ diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkcli b/zookeeper-command-line-client/src/main/sh/vespa-zkcli index bab29218207..66c496b0d29 100755 --- a/zookeeper-command-line-client/src/main/sh/vespa-zkcli +++ b/zookeeper-command-line-client/src/main/sh/vespa-zkcli @@ -72,8 +72,11 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section -java -cp $VESPA_HOME/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \ +java -cp ${VESPA_HOME}/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \ -Dlog4j.configuration="log4j-vespa.properties" -Xms32m -Xmx512m \ com.yahoo.vespa.zookeeper.cli.Main "$@" diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkctl b/zookeeper-command-line-client/src/main/sh/vespa-zkctl index 06d32848128..cf10c796d16 100755 --- a/zookeeper-command-line-client/src/main/sh/vespa-zkctl +++ b/zookeeper-command-line-client/src/main/sh/vespa-zkctl @@ -72,7 +72,10 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section # Get rid of the interactive zkcli prompt by running it in a subshell -(echo "$@" | $VESPA_HOME/bin/vespa-zkcli) +(echo "$@" | ${VESPA_HOME}/bin/vespa-zkcli) diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkflw b/zookeeper-command-line-client/src/main/sh/vespa-zkflw index f0619004579..5ae8ff5f7ac 100644 --- a/zookeeper-command-line-client/src/main/sh/vespa-zkflw +++ b/zookeeper-command-line-client/src/main/sh/vespa-zkflw @@ -72,8 +72,11 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section -java -cp $VESPA_HOME/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \ +java -cp ${VESPA_HOME}/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \ -Dlog4j.configuration="log4j-vespa.properties" -Xms32m -Xmx512m \ com.yahoo.vespa.zookeeper.cli.FourLetterWordMain "$@" diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zkls b/zookeeper-command-line-client/src/main/sh/vespa-zkls index dca81c55831..6d3fa3a1873 100755 --- a/zookeeper-command-line-client/src/main/sh/vespa-zkls +++ b/zookeeper-command-line-client/src/main/sh/vespa-zkls @@ -72,6 +72,9 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section -$VESPA_HOME/bin/vespa-zkctl ls $@ +${VESPA_HOME}/bin/vespa-zkctl ls $@ diff --git a/zookeeper-command-line-client/src/main/sh/vespa-zktxnlog b/zookeeper-command-line-client/src/main/sh/vespa-zktxnlog index f6868c76906..78ec7a1f126 100755 --- a/zookeeper-command-line-client/src/main/sh/vespa-zktxnlog +++ b/zookeeper-command-line-client/src/main/sh/vespa-zktxnlog @@ -72,8 +72,11 @@ findhost () { findroot findhost +ROOT=${VESPA_HOME%/} +export ROOT + # END environment bootstrap section -java -cp $VESPA_HOME/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \ +java -cp ${VESPA_HOME}/lib/jars/zookeeper-command-line-client-jar-with-dependencies.jar \ -Xms32m -Xmx512m \ org.apache.zookeeper.server.persistence.TxnLogToolkit "$@" |