From 47abc2603f795925c5bf6a88ab5d5fdce1510d23 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 11 Feb 2020 08:55:11 -0500 Subject: [PATCH 1/2] specify the path to ziti instead of expecting it on the path --- quickstart/local/init.sh | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/quickstart/local/init.sh b/quickstart/local/init.sh index eb34bbd6d..050b2381a 100755 --- a/quickstart/local/init.sh +++ b/quickstart/local/init.sh @@ -1,6 +1,19 @@ #!/bin/bash commands_to_test=(ziti ziti-router ziti-controller bash tee jq curl cat dos2unix) +if [[ "" == "$1" ]] +then + echo " " + echo "USAGE: $0 " + echo " " + echo " Please provide the path to the ziti binaries" + exit 1 +else + export PATH="$PATH:$1" +fi + +echo "PATH: $PATH" + # verify all the commands required in the automation exist before trying to run the full suite for cmd in "${commands_to_test[@]}" do @@ -26,14 +39,15 @@ echo "${missing_requirements}" export curdir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" # if no network name is supplied, use the current user name as the network name -if [[ "" == "$1" ]] +if [[ "" == "$2" ]] then export network_name="${USER}" else - export network_name="$1" + export network_name="$2" fi echo "Network name set to: ${network_name}" + . ${curdir}/env.sh echo "This script relies on the following hosts being active on your network and since this is a local" From d8562b61c9adcfc1146c2e3c10a789b8e96c10eb Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Tue, 11 Feb 2020 08:56:38 -0500 Subject: [PATCH 2/2] remove path echo --- quickstart/local/init.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/quickstart/local/init.sh b/quickstart/local/init.sh index 050b2381a..c076a32f1 100755 --- a/quickstart/local/init.sh +++ b/quickstart/local/init.sh @@ -12,8 +12,6 @@ else export PATH="$PATH:$1" fi -echo "PATH: $PATH" - # verify all the commands required in the automation exist before trying to run the full suite for cmd in "${commands_to_test[@]}" do