mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'patch-2' of git://github.com/wmertens/nix

Browse source 
install-nix-from-closure improvments
This commit is contained in:
Shea Levy 2016-04-12 07:33:04 -04:00
commit 1b3e704fb9
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
scripts/install-nix-from-closure.sh
View file

@ -1,4 +1,4 @@
#! /usr/bin/env bash #!/bin/sh
set -e set -e
@ -49,7 +49,10 @@ for i in $(cd $self/store >/dev/null && echo *); do
fi fi
if ! [ -e "$dest/store/$i" ]; then if ! [ -e "$dest/store/$i" ]; then
cp -Rp "$self/store/$i" "$i_tmp" cp -Rp "$self/store/$i" "$i_tmp"
chmod -R a-w "$i_tmp"
chmod +w "$i_tmp"
mv "$i_tmp" "$dest/store/$i" mv "$i_tmp" "$dest/store/$i"
chmod -w "$dest/store/$i"
fi fi
done done
echo "" >&2 echo "" >&2
@ -65,6 +68,11 @@ if ! $nix/bin/nix-store --load-db < $self/.reginfo; then
exit 1 exit 1
fi fi
if ! $nix/bin/nix-store --verify; then
echo "$0: store verification failed! Consider deleting /nix and starting over" >&2
exit 1
fi
. $nix/etc/profile.d/nix.sh . $nix/etc/profile.d/nix.sh
if ! $nix/bin/nix-env -i "$nix"; then if ! $nix/bin/nix-env -i "$nix"; then