diff options
author | Arnstein Ressem <aressem@verizonmedia.com> | 2019-07-09 07:40:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-09 07:40:36 +0200 |
commit | 0bb6ba9a7b369620c9856534b97b07f1b80e89ff (patch) | |
tree | c9cac1ba4bd0bcc231747e9bb654f5a257803460 | |
parent | edbdd20cbf7624597b640d2f28bf2b88fb116c87 (diff) | |
parent | dc370818dea5a1896dccc5ab525755d036705c32 (diff) |
Merge pull request #9992 from vespa-engine/revert-9984-revert-9108-revert-9104-hmusum/rename-zkfacade-scripts
Revert "Reapply "Rename scripts""
-rw-r--r-- | zkfacade/CMakeLists.txt | 8 | ||||
-rwxr-xr-x | zkfacade/src/main/sh/zkcat (renamed from zkfacade/src/main/sh/vespa-zkls) | 2 | ||||
-rwxr-xr-x | zkfacade/src/main/sh/zkcli (renamed from zkfacade/src/main/sh/vespa-zkcli) | 0 | ||||
-rwxr-xr-x | zkfacade/src/main/sh/zkctl (renamed from zkfacade/src/main/sh/vespa-zkctl) | 2 | ||||
-rwxr-xr-x | zkfacade/src/main/sh/zkls (renamed from zkfacade/src/main/sh/vespa-zkcat) | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/zkfacade/CMakeLists.txt b/zkfacade/CMakeLists.txt index 52eae58e108..cf02f163e67 100644 --- a/zkfacade/CMakeLists.txt +++ b/zkfacade/CMakeLists.txt @@ -2,7 +2,7 @@ install_fat_java_artifact(zkfacade) install_fat_java_artifact(zkctl) -vespa_install_script(src/main/sh/vespa-zkcat vespa-zkcat bin) -vespa_install_script(src/main/sh/vespa-zkcli vespa-zkcli bin) -vespa_install_script(src/main/sh/vespa-zkctl vespa-zkctl bin) -vespa_install_script(src/main/sh/vespa-zkls vespa-zkls bin) +vespa_install_script(src/main/sh/zkcat vespa-zkcat bin) +vespa_install_script(src/main/sh/zkcli vespa-zkcli bin) +vespa_install_script(src/main/sh/zkctl vespa-zkctl bin) +vespa_install_script(src/main/sh/zkls vespa-zkls bin) diff --git a/zkfacade/src/main/sh/vespa-zkls b/zkfacade/src/main/sh/zkcat index 5ab1204cea8..675aeabbcfb 100755 --- a/zkfacade/src/main/sh/vespa-zkls +++ b/zkfacade/src/main/sh/zkcat @@ -70,4 +70,4 @@ findhost # END environment bootstrap section -$VESPA_HOME/bin/vespa-zkctl ls $@ +$VESPA_HOME/bin/zkctl get $@ diff --git a/zkfacade/src/main/sh/vespa-zkcli b/zkfacade/src/main/sh/zkcli index cbc356ae9e1..cbc356ae9e1 100755 --- a/zkfacade/src/main/sh/vespa-zkcli +++ b/zkfacade/src/main/sh/zkcli diff --git a/zkfacade/src/main/sh/vespa-zkctl b/zkfacade/src/main/sh/zkctl index 43112abd925..721becf8c79 100755 --- a/zkfacade/src/main/sh/vespa-zkctl +++ b/zkfacade/src/main/sh/zkctl @@ -71,4 +71,4 @@ findhost # 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/zkcli) diff --git a/zkfacade/src/main/sh/vespa-zkcat b/zkfacade/src/main/sh/zkls index ba8924b456f..c75f63efbde 100755 --- a/zkfacade/src/main/sh/vespa-zkcat +++ b/zkfacade/src/main/sh/zkls @@ -70,4 +70,4 @@ findhost # END environment bootstrap section -$VESPA_HOME/bin/vespa-zkctl get $@ +$VESPA_HOME/bin/zkctl ls $@ |