* Switched from wget to curl.

* Made the dependencies on bzip2 and the shell explicit.

3 files changed, 12 insertions, 13 deletions

diff --git a/corepkgs/fetchurl/builder.sh.in b/corepkgs/fetchurl/builder.sh.in
index a6cc699302..4379b423db 100644
--- a/corepkgs/fetchurl/builder.sh.in
+++ b/corepkgs/fetchurl/builder.sh.in
@@ -1,15 +1,15 @@
-#! /bin/sh
+#! @shell@ -e
 
 export PATH=/bin:/usr/bin
 
-echo "downloading $url into $out..."
+echo "downloading $url into $out"
 
 prefetch=@prefix@/store/nix-prefetch-url-$md5
 if test -f "$prefetch"; then
     echo "using prefetched $prefetch";
-    mv $prefetch $out || exit 1
+    mv $prefetch $out
 else
-    @wget@ --passive-ftp "$url" -O "$out" || exit 1
+    @curl@ --fail --location --max-redirs 20 "$url" > "$out"
 fi
 
 actual=$(@bindir@/nix-hash --flat $out)
diff --git a/corepkgs/nar/nar.sh.in b/corepkgs/nar/nar.sh.in
index 8d3fdb51b2..9635d29f4f 100644
--- a/corepkgs/nar/nar.sh.in
+++ b/corepkgs/nar/nar.sh.in
@@ -1,12 +1,13 @@
-#! /bin/sh
+#! @shell@ -e
 
+# !!! impure; fix this
 export PATH=/bin:/usr/bin
 
 echo "packing $path into $out..."
-mkdir $out || exit 1
-dst=$out/`basename $path`.nar.bz2
-@bindir@/nix-store --dump "$path" | bzip2 > $dst || exit 1
+mkdir $out
+dst=$out/$(basename $path).nar.bz2
+@bindir@/nix-store --dump "$path" | @bzip2@ > $dst
 
 md5=$(md5sum -b $dst | cut -c1-32)
 if test $? != 0; then exit 1; fi
-echo $md5 > $out/md5 || exit 1
+echo $md5 > $out/md5
diff --git a/corepkgs/nar/unnar.sh.in b/corepkgs/nar/unnar.sh.in
index b0b6f9d468..6fab350a17 100644
--- a/corepkgs/nar/unnar.sh.in
+++ b/corepkgs/nar/unnar.sh.in
@@ -1,6 +1,4 @@
-#! /bin/sh
-
-export PATH=/bin:/usr/bin
+#! @shell@ -e
 
 echo "unpacking $narFile to $out..."
-bunzip2 < $narFile | @bindir@/nix-store --restore "$out" || exit 1
+@bunzip2@ < $narFile | @bindir@/nix-store --restore "$out"