From 97247845fe921a98be07efdde0bb97ea6d50bde7 Mon Sep 17 00:00:00 2001 From: Conny Brunnkvist Date: Mon, 13 Sep 2021 18:35:31 +0700 Subject: [PATCH] Detect launcher download error earlier (and clean up failed downloads) --- sbt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sbt b/sbt index 0a2ae9380..91ac48f9b 100755 --- a/sbt +++ b/sbt @@ -116,13 +116,20 @@ jar_url () { download_url () { local url="$1" local jar="$2" + local exit_code mkdir -p $(dirname "$jar") && { if command -v curl > /dev/null; then curl --fail --silent -L "$url" --output "$jar" + exit_code=$? elif command -v wget > /dev/null; then wget --quiet -O "$jar" "$url" + exit_code=$? fi - } && [[ -f "$jar" ]] + $(exit "$exit_code") && [[ -f "$jar" ]] + } || { + echoerr "Error while fetching ${url}" + rm -f "$jar" + } } acquire_sbt_jar () {