From 1db7094966bc86658166709db26b7750d8fc2821 Mon Sep 17 00:00:00 2001 From: romkatv Date: Mon, 11 May 2020 18:19:51 +0200 Subject: [PATCH] Squashed 'gitstatus/' changes from cd5673b4..d3bc3e34 d3bc3e34 work around bugs in curl on cygwin; see #706 61a67c66 print error message from curl/wget before the summary git-subtree-dir: gitstatus git-subtree-split: d3bc3e346cc71ee1a29d0c4316449feb3dcb3116 --- install | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/install b/install index f747015c..1ae8d8dd 100755 --- a/install +++ b/install @@ -207,15 +207,17 @@ END local url="https://github.com/romkatv/gitstatus/releases/download/$version/$file.tar.gz" local archive="$cache_dir"/"$file".tmp.$$.tar.gz if command -v curl >/dev/null 2>&1; then - if ! err="$(command curl -fsSLo "$archive" -- "$url" 2>&1)"; then - >&2 echo "[gitstatus] error: failed to download gitstatusd: $url" + # `cd` is a workaround for Cygwin. It cannot handle -o with slashes. + if ! err="$(cd ${ZSH_VERSION:+-q} -- "$cache_dir" 2>&1 && + command curl -fsSLo "${archive##*/}" -- "$url" 2>&1)"; then >&2 printf "%s\n" "$err" + >&2 echo "[gitstatus] error: failed to download gitstatusd: $url" return 1 fi elif command -v wget >/dev/null 2>&1; then if ! err="$(command wget -O "$archive" -- "$url" 2>&1)"; then - >&2 echo "[gitstatus] error: failed to download gitstatusd: $url" >&2 printf "%s\n" "$err" + >&2 echo "[gitstatus] error: failed to download gitstatusd: $url" return 1 fi else