From 5d8b700a54cfdfa42e9566114a3d65d3a6367ba7 Mon Sep 17 00:00:00 2001 From: Kenneth Bingham Date: Fri, 8 Sep 2023 11:37:44 -0400 Subject: [PATCH] let login command depend on ziti command --- .../docs/learn/quickstarts/network/miniziti.bash | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/docusaurus/docs/learn/quickstarts/network/miniziti.bash b/docusaurus/docs/learn/quickstarts/network/miniziti.bash index 2c09911c4..4b048df48 100644 --- a/docusaurus/docs/learn/quickstarts/network/miniziti.bash +++ b/docusaurus/docs/learn/quickstarts/network/miniziti.bash @@ -210,6 +210,7 @@ showAdminCreds() { } miniziti_login() { + check_command ziti getAdminSecret | xargs ziti edge login \ --cli-identity "$MINIKUBE_PROFILE" \ --username "admin" \ @@ -275,15 +276,19 @@ helm_wrapper() { helm --kube-context "$MINIKUBE_PROFILE" "$@" } +check_command() { + if ! command -v "$1" &>/dev/null; then + logError "this script requires command '$1'. Please install on the search PATH and try again." + $1 + fi +} + main(){ MINIZITI_DEBUG=0 # require commands - declare -a BINS=(ziti minikube kubectl helm sed) + declare -a BINS=(minikube helm sed) for BIN in "${BINS[@]}"; do - if ! command -v "$BIN" &>/dev/null; then - logError "this script requires commands '${BINS[*]}'. Please install on the search PATH and try again." - $BIN || exit 1 - fi + check_command "$BIN" done # open a descriptor for debug messages