diff options
| author | Graham Christensen <graham@grahamc.com> | 2017-07-14T10·28-0400 |
|---|---|---|
| committer | Graham Christensen <graham@grahamc.com> | 2017-07-14T16·11-0400 |
| commit | e0d39c8dc47af203ef0647c277e0e26f3b9176d4 (patch) | |
| tree | ca02e7f35a6348de3b767e1d556c56d11ed106a7 | |
| parent | 12f6bb33d2cf56e8adf482950734a9af5f78a496 (diff) | |
Rename PINCH_ME_IM_SILLY to ALLOW_PREEXISTING_INSTALLATION
| -rw-r--r-- | scripts/install-darwin-multi-user.sh | 6 | ||||
| -rwxr-xr-x | tests/install-darwin.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index cde40a7f25e8..a2e120bf8625 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -417,8 +417,8 @@ 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" + if [ "${ALLOW_PREEXISTING_INSTALLATION:-}" != "" ]; then + row "Preexisting Install" "Allowed" fi subheader "build users:" @@ -777,7 +777,7 @@ main() { welcome_to_nix chat_about_sudo - if [ "${PINCH_ME_IM_SILLY:-}" = "" ]; then + if [ "${ALLOW_PREEXISTING_INSTALLATION:-}" = "" ]; then validate_starting_assumptions fi diff --git a/tests/install-darwin.sh b/tests/install-darwin.sh index eb251fa39394..c99ce84acab0 100755 --- a/tests/install-darwin.sh +++ b/tests/install-darwin.sh @@ -88,7 +88,7 @@ verify sudo mkdir -p /nix/store sudo touch /nix/store/.silly-hint - echo -n "" | PINCH_ME_IM_SILLY=true ./install + echo -n "" | ALLOW_PREEXISTING_INSTALLATION=true ./install verify test -e /nix/store/.silly-hint |