about summary refs log tree commit diff
path: root/corepkgs/nar
diff options
context:
space:
mode:
Diffstat (limited to 'corepkgs/nar')
-rw-r--r--corepkgs/nar/nar.sh.in11
-rw-r--r--corepkgs/nar/unnar.sh.in6
2 files changed, 8 insertions, 9 deletions
diff --git a/corepkgs/nar/nar.sh.in b/corepkgs/nar/nar.sh.in
index 8d3fdb51b283..9635d29f4f74 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 b0b6f9d468f2..6fab350a1782 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"