summaryrefslogtreecommitdiffstats
path: root/zkfacade
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-07-09 08:00:12 +0200
committerGitHub <noreply@github.com>2019-07-09 08:00:12 +0200
commitc70f7b5c1b6ce6b9a020992940f624a1a8e832ad (patch)
treec3dede914a46148cb01323d254ff046546174176 /zkfacade
parent0bb6ba9a7b369620c9856534b97b07f1b80e89ff (diff)
Revert "Revert "Reapply "Rename scripts"""
Diffstat (limited to 'zkfacade')
-rw-r--r--zkfacade/CMakeLists.txt8
-rwxr-xr-xzkfacade/src/main/sh/vespa-zkcat (renamed from zkfacade/src/main/sh/zkls)2
-rwxr-xr-xzkfacade/src/main/sh/vespa-zkcli (renamed from zkfacade/src/main/sh/zkcli)0
-rwxr-xr-xzkfacade/src/main/sh/vespa-zkctl (renamed from zkfacade/src/main/sh/zkctl)2
-rwxr-xr-xzkfacade/src/main/sh/vespa-zkls (renamed from zkfacade/src/main/sh/zkcat)2
5 files changed, 7 insertions, 7 deletions
diff --git a/zkfacade/CMakeLists.txt b/zkfacade/CMakeLists.txt
index cf02f163e67..52eae58e108 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/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)
+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)
diff --git a/zkfacade/src/main/sh/zkls b/zkfacade/src/main/sh/vespa-zkcat
index c75f63efbde..ba8924b456f 100755
--- a/zkfacade/src/main/sh/zkls
+++ b/zkfacade/src/main/sh/vespa-zkcat
@@ -70,4 +70,4 @@ findhost
# END environment bootstrap section
-$VESPA_HOME/bin/zkctl ls $@
+$VESPA_HOME/bin/vespa-zkctl get $@
diff --git a/zkfacade/src/main/sh/zkcli b/zkfacade/src/main/sh/vespa-zkcli
index cbc356ae9e1..cbc356ae9e1 100755
--- a/zkfacade/src/main/sh/zkcli
+++ b/zkfacade/src/main/sh/vespa-zkcli
diff --git a/zkfacade/src/main/sh/zkctl b/zkfacade/src/main/sh/vespa-zkctl
index 721becf8c79..43112abd925 100755
--- a/zkfacade/src/main/sh/zkctl
+++ b/zkfacade/src/main/sh/vespa-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/zkcli)
+(echo "$@" | $VESPA_HOME/bin/vespa-zkcli)
diff --git a/zkfacade/src/main/sh/zkcat b/zkfacade/src/main/sh/vespa-zkls
index 675aeabbcfb..5ab1204cea8 100755
--- a/zkfacade/src/main/sh/zkcat
+++ b/zkfacade/src/main/sh/vespa-zkls
@@ -70,4 +70,4 @@ findhost
# END environment bootstrap section
-$VESPA_HOME/bin/zkctl get $@
+$VESPA_HOME/bin/vespa-zkctl ls $@