From 720dccf2b72d4cd5b69db9e1433917b7c54525f5 Mon Sep 17 00:00:00 2001 From: dovholuknf <46322585+dovholuknf@users.noreply.github.com> Date: Thu, 10 Jun 2021 20:25:55 -0400 Subject: [PATCH] testing with gitbash --- quickstart/docker/image/ziti-cli-functions.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/quickstart/docker/image/ziti-cli-functions.sh b/quickstart/docker/image/ziti-cli-functions.sh index ea0ce6f49..5a4d64858 100755 --- a/quickstart/docker/image/ziti-cli-functions.sh +++ b/quickstart/docker/image/ziti-cli-functions.sh @@ -160,7 +160,7 @@ function getLatestZiti { if ! test -f "${ZITI_BINARIES_FILE_ABSPATH}"; then zitidl="https://github.com/openziti/ziti/releases/download/${ZITI_BINARIES_VERSION-}/${ZITI_BINARIES_FILE}" echo -e 'Downloading '"$(BLUE "${zitidl}")"' to '"$(BLUE "${ZITI_BINARIES_FILE_ABSPATH}")" - wget -q "${zitidl}" -O "${ZITI_BINARIES_FILE_ABSPATH}" + curl -Ls "${zitidl}" -o "${ZITI_BINARIES_FILE_ABSPATH}" else echo -e "$(YELLOW 'Already Downloaded ')""$(BLUE "${ZITI_BINARIES_FILE}")"' at: '"${ZITI_BINARIES_FILE_ABSPATH}" fi @@ -193,7 +193,7 @@ function getLatestZiti { } function checkPrereqs { - commands_to_test=(curl jq wget) + commands_to_test=(curl jq) missing_requirements="" # verify all the commands required in the automation exist before trying to run the full suite for cmd in "${commands_to_test[@]}" @@ -1327,8 +1327,9 @@ function setOs { #echo -e " * ERROR: $(RED "\$OSTYPE [$OSTYPE] is not supported at this time") " #return 1 elif [[ "$OSTYPE" == "msys" ]]; then - echo -e " * ERROR: $(RED "\$OSTYPE [$OSTYPE] is not supported at this time") " - return 1 + export ZITI_OSTYPE="windows" + #echo -e " * ERROR: $(RED "\$OSTYPE [$OSTYPE] is not supported at this time") " + #return 1 elif [[ "$OSTYPE" == "win32" ]]; then export ZITI_OSTYPE="windows" elif [[ "$OSTYPE" == "freebsd"* ]]; then