diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-07-13T22·01-0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-07-14T16·11-0400 |
| commit | ce2281e6d86aa1b461dd27f86b2a71145e85ac8d (patch) | |
| tree | 93de7a64973f6002185defc3dcb6e827fa18f112 | |
| parent | 1c7ce2a018a081dd90dfefee6d1ca7e0c9fd66d9 (diff) | |
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
| -rw-r--r-- | scripts/install-darwin-multi-user.sh | 8 | ||||
| -rwxr-xr-x | tests/install-darwin.sh | 7 |
2 files changed, 9 insertions, 6 deletions
diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 368d9957e110..b1d258e0cade 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -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 diff --git a/tests/install-darwin.sh b/tests/install-darwin.sh index b7f87467287c..3f64944ef814 100755 --- a/tests/install-darwin.sh +++ b/tests/install-darwin.sh @@ -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 ) |