philiptaron/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Ensure PINCH_ME_IM_SILLY allows a /nix/store to stick around between builds

Browse source 
Also output in the status report that the user is very silly
This commit is contained in:
Graham Christensen 2017-07-13 18:01:22 -04:00
parent 1c7ce2a018
commit ce2281e6d8
No known key found for this signature in database
GPG key ID: 06121D366FE9435C
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
scripts/install-darwin-multi-user.sh
View file

@ -408,6 +408,9 @@ setup_report() {
row " Build Users" "$NIX_USER_COUNT" row " Build Users" "$NIX_USER_COUNT"
row " Build Group ID" "$NIX_BUILD_GROUP_ID" row " Build Group ID" "$NIX_BUILD_GROUP_ID"
row "Build Group Name" "$NIX_BUILD_GROUP_NAME" row "Build Group Name" "$NIX_BUILD_GROUP_NAME"
if [ "${PINCH_ME_IM_SILLY:-}" != "" ]; then
row " Silliness" "Very Silly"
fi
subheader "build users:" subheader "build users:"
@ -757,11 +760,6 @@ main() {
exit 1 exit 1
fi fi
if [ "${PINCH_ME_IM_SILLY:-}" != "" ]; then
exit 1
fi
create_build_group create_build_group
create_build_users create_build_users
create_directories create_directories

7
tests/install-darwin.sh
View file

@ -80,11 +80,16 @@ verify
yes | ./install yes | ./install
verify verify
cleanup cleanup
echo -n "" | ./install echo -n "" | ./install
verify verify
cleanup
sudo mkdir -p /nix/store
sudo touch /nix/store/.silly-hint
echo -n "" | PINCH_ME_IM_SILLY=true ./install
verify
test -e /nix/store/.silly-hint
cleanup cleanup
) )