diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-08-27T20·18+0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-08-27T20·18+0200 |
| commit | ceefddafe839a0c9ac553367e16f965dda7fb086 (patch) | |
| tree | de374548bd7a6369a63302f9539b4e365bbdc733 /scripts/install.in | |
| parent | 787015fec0f64ae10653231d86111564d71f5d4c (diff) | |
Compress binary tarballs using xz
Fixes https://github.com/NixOS/nix/issues/240. Apparently 'tar -xf' can decompress xz files on macOS nowadays.
Diffstat (limited to 'scripts/install.in')
| -rw-r--r-- | scripts/install.in | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/install.in b/scripts/install.in index 4857638c02..902758b138 100644 --- a/scripts/install.in +++ b/scripts/install.in @@ -30,12 +30,11 @@ case "$(uname -s).$(uname -m)" in *) oops "sorry, there is no binary distribution of Nix for your platform";; esac -url="https://nixos.org/releases/nix/nix-@nixVersion@/nix-@nixVersion@-$system.tar.bz2" +url="https://nixos.org/releases/nix/nix-@nixVersion@/nix-@nixVersion@-$system.tar.xz" -tarball="$tmpDir/$(basename "$tmpDir/nix-@nixVersion@-$system.tar.bz2")" +tarball="$tmpDir/$(basename "$tmpDir/nix-@nixVersion@-$system.tar.xz")" require_util curl "download the binary tarball" -require_util bzcat "decompress the binary tarball" require_util tar "unpack the binary tarball" echo "downloading Nix @nixVersion@ binary tarball for $system from '$url' to '$tmpDir'..." @@ -57,7 +56,7 @@ fi unpack=$tmpDir/unpack mkdir -p "$unpack" -< "$tarball" bzcat | tar -xf - -C "$unpack" || oops "failed to unpack '$url'" +tar -xf "$tarball" -C "$unpack" || oops "failed to unpack '$url'" script=$(echo "$unpack"/*/install) |