picnoir
/
nix-gh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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 b01eaa6114
commit 6b6d4b69c1
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 Group ID" "$NIX_BUILD_GROUP_ID"
row "Build Group Name" "$NIX_BUILD_GROUP_NAME"
if [ "${PINCH_ME_IM_SILLY:-}" != "" ]; then
row " Silliness" "Very Silly"
fi
subheader "build users:"
@ -757,11 +760,6 @@ main() {
exit 1
fi
if [ "${PINCH_ME_IM_SILLY:-}" != "" ]; then
exit 1
fi
create_build_group
create_build_users
create_directories

7
tests/install-darwin.sh
View File

@ -80,11 +80,16 @@ verify
yes | ./install
verify
cleanup
echo -n "" | ./install
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
)