diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-01-06 12:43:07 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-01-06 12:43:07 +0100 |
| commit | 1dc29df1d384e90d0604e1b21150cfc93b58ff56 (patch) | |
| tree | c48f2e772fa5d01eda24f1bd165380f2534dd25a /scripts | |
| parent | c7866733d7ce2836fbb43de90dd64d17b0d20753 (diff) | |
| parent | 0486e87791f0d50f98ccd46c56f32ecc4e1bc79c (diff) | |
Merge remote-tracking branch 'origin/master' into flakes
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/install-nix-from-closure.sh | 2 | ||||
| -rw-r--r-- | scripts/install.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/install-nix-from-closure.sh b/scripts/install-nix-from-closure.sh index 3f1581854..3fea7e056 100644 --- a/scripts/install-nix-from-closure.sh +++ b/scripts/install-nix-from-closure.sh @@ -102,7 +102,7 @@ for i in $(cd "$self/store" >/dev/null && echo ./*); do rm -rf "$i_tmp" fi if ! [ -e "$dest/store/$i" ]; then - cp -Rp "$self/store/$i" "$i_tmp" + cp -RPp "$self/store/$i" "$i_tmp" chmod -R a-w "$i_tmp" chmod +w "$i_tmp" mv "$i_tmp" "$dest/store/$i" diff --git a/scripts/install.in b/scripts/install.in index 902758b13..76cb3b1fd 100644 --- a/scripts/install.in +++ b/scripts/install.in @@ -56,7 +56,7 @@ fi unpack=$tmpDir/unpack mkdir -p "$unpack" -tar -xf "$tarball" -C "$unpack" || oops "failed to unpack '$url'" +tar -xJf "$tarball" -C "$unpack" || oops "failed to unpack '$url'" script=$(echo "$unpack"/*/install) |