From 6b2935afd32dcc7ffa3a9969a6af03809e15891a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan-Otto=20Kr=C3=B6pke?= Date: Mon, 17 Jan 2022 00:02:56 +0100 Subject: [PATCH 1/3] Fix cygwin --- install-binary.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/install-binary.sh b/install-binary.sh index 3a9e5f98..ee1433c4 100755 --- a/install-binary.sh +++ b/install-binary.sh @@ -53,14 +53,16 @@ initArch() { # initOS discovers the operating system for this system. initOS() { - OS=$(uname | tr '[:upper:]' '[:lower:]') + OS=$(uname -s) case "$OS" in # Msys support - msys*) OS='windows' ;; + MSYS*) OS='windows' ;; # Minimalist GNU for Windows - mingw*) OS='windows' ;; - darwin) OS='macos' ;; + MINGW*) OS='windows' ;; + CYGWIN*) OS='windows' ;; + Darwin) OS='macos' ;; + Linux) OS='linux' ;; esac } @@ -105,16 +107,16 @@ downloadFile() { PLUGIN_TMP_FILE="${HELM_TMP}/${PROJECT_NAME}.tgz" echo "Downloading $DOWNLOAD_URL" if type "curl" >/dev/null; then - curl -L "$DOWNLOAD_URL" -o "$PLUGIN_TMP_FILE" + curl -sSf -L "$DOWNLOAD_URL" > "$PLUGIN_TMP_FILE" elif type "wget" >/dev/null; then - wget -q -O "$PLUGIN_TMP_FILE" "$DOWNLOAD_URL" + wget -q -O - "$DOWNLOAD_URL" > "$PLUGIN_TMP_FILE" fi } # installFile verifies the SHA256 for the file, then unpacks and # installs it. installFile() { - tar xvzf "$PLUGIN_TMP_FILE" -C "$HELM_TMP" + tar xzf "$PLUGIN_TMP_FILE" -C "$HELM_TMP" HELM_TMP_BIN="$HELM_TMP/diff/bin/diff" echo "Preparing to install into ${HELM_PLUGIN_DIR}" mkdir -p "$HELM_PLUGIN_DIR/bin" From ff6cb3c5257d7f41e8bad11f1d8687dc17bd8e59 Mon Sep 17 00:00:00 2001 From: Yusuke Kuoka Date: Sat, 22 Jan 2022 06:53:23 +0000 Subject: [PATCH 2/3] fixup! Merge branch 'master' into fix-cygwin --- install-binary.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-binary.sh b/install-binary.sh index 789130e1..a2b69a54 100755 --- a/install-binary.sh +++ b/install-binary.sh @@ -110,11 +110,11 @@ downloadFile() { if command -v curl >/dev/null 2>&1 then - curl -L "$DOWNLOAD_URL" -o "$PLUGIN_TMP_FILE" + curl -sSf -L "$DOWNLOAD_URL" > "$PLUGIN_TMP_FILE" elif command -v wget >/dev/null 2>&1 then - wget -q -O "$PLUGIN_TMP_FILE" "$DOWNLOAD_URL" + wget -q -O - "$DOWNLOAD_URL" > "$PLUGIN_TMP_FILE" fi } From 801f5c54d157a31fdea5693cf6a54aa9b14cfbdb Mon Sep 17 00:00:00 2001 From: Yusuke Kuoka Date: Sat, 22 Jan 2022 07:06:25 +0000 Subject: [PATCH 3/3] fixup! fixup! Merge branch 'master' into fix-cygwin --- install-binary.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install-binary.sh b/install-binary.sh index a2b69a54..ea0e7cc0 100755 --- a/install-binary.sh +++ b/install-binary.sh @@ -110,11 +110,11 @@ downloadFile() { if command -v curl >/dev/null 2>&1 then - curl -sSf -L "$DOWNLOAD_URL" > "$PLUGIN_TMP_FILE" + curl -sSf -L "$DOWNLOAD_URL" >"$PLUGIN_TMP_FILE" elif command -v wget >/dev/null 2>&1 then - wget -q -O - "$DOWNLOAD_URL" > "$PLUGIN_TMP_FILE" + wget -q -O - "$DOWNLOAD_URL" >"$PLUGIN_TMP_FILE" fi }