diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-04-06 08:18:51 +0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2004-04-06 08:18:51 +0000 |
| commit | 03f1d1ecb5ef69c8c065c83373f9f9f749995c50 (patch) | |
| tree | 015504d426363cf19aea03589281593cf7f31a20 /corepkgs/nar | |
| parent | 59b94ee18ac0cba5c7b261ee72550a4d3db0acb5 (diff) | |
* Switched from wget to curl.
* Made the dependencies on bzip2 and the shell explicit.
Diffstat (limited to 'corepkgs/nar')
| -rw-r--r-- | corepkgs/nar/nar.sh.in | 11 | ||||
| -rw-r--r-- | corepkgs/nar/unnar.sh.in | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/corepkgs/nar/nar.sh.in b/corepkgs/nar/nar.sh.in index 8d3fdb51b..9635d29f4 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 b0b6f9d46..6fab350a1 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" |