summary refs log tree commit diff
path: root/pkgs/build-support/fetchurl
diff options
context:
space:
mode:
authorDomen Kožar <domen@dev.si>2014-10-05 09:51:57 +0200
committerDomen Kožar <domen@dev.si>2014-10-05 09:53:18 +0200
commitd6b777875361aa2f18a3f75f56fe109e38832211 (patch)
tree48f2b3685e096c1070168f6323bb83ad164f0302 /pkgs/build-support/fetchurl
parentf1572d37c3e36f0428b75085f06b8de4192ec24b (diff)
downloadnixlib-d6b777875361aa2f18a3f75f56fe109e38832211.tar
nixlib-d6b777875361aa2f18a3f75f56fe109e38832211.tar.gz
nixlib-d6b777875361aa2f18a3f75f56fe109e38832211.tar.bz2
nixlib-d6b777875361aa2f18a3f75f56fe109e38832211.tar.lz
nixlib-d6b777875361aa2f18a3f75f56fe109e38832211.tar.xz
nixlib-d6b777875361aa2f18a3f75f56fe109e38832211.tar.zst
nixlib-d6b777875361aa2f18a3f75f56fe109e38832211.zip
fetchurl: fix mirroring after ecf5a08831f18e3ae2fc857c70d60fc11f622dd6
Diffstat (limited to 'pkgs/build-support/fetchurl')
-rw-r--r--pkgs/build-support/fetchurl/builder.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index 48881bdb2844..8a0c6f94a40d 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -27,16 +27,17 @@ tryDownload() {
     header "trying $url"
     local curlexit=18;
 
+    success=
+
     # if we get error code 18, resume partial download
     while [ $curlexit -eq 18 ]; do
-        $curl -C - --fail "$url" --output "$downloadedFile"
-        local curlexit=$?;
+       # keep this inside an if statement, since on failure it doesn't abort the script
+       if $curl -C - --fail "$url" --output "$downloadedFile"; then
+          success=1
+       else
+          curlexit=$?;
+       fi
     done
-
-    success=
-    if [ $curlexit -eq 0 ]; then
-        success=1
-    fi
     stopNest
 }