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

Rename PINCH_ME_IM_SILLY to ALLOW_PREEXISTING_INSTALLATION

This commit is contained in:
Graham Christensen 2017-07-14 06:28:24 -04:00
parent 6ba624f25a
commit e4831a4412
No known key found for this signature in database
GPG Key ID: 06121D366FE9435C
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/install-darwin-multi-user.sh
View File

@ -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

2
tests/install-darwin.sh
View File

@ -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