diff options
| author | Anthony Cowley <acowley@gmail.com> | 2017-10-03T00·07-0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03T00·07-0400 |
| commit | 92f9d18aa030805189b7bf31bb1d129c49edc83f (patch) | |
| tree | cc052d8619092418536769841908c7496e41ba87 | |
| parent | f3e0d468218994343d0e595a50304cc122ad1406 (diff) | |
install-darwin-multi-user: relax assumption check
The installer will error out if a user's shell configuration includes any mention of ~nix-profile~, even if this is in a comment. This change is designed to do the bare minimum to ignore lines beginning with a `#`.
| -rw-r--r-- | scripts/install-darwin-multi-user.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 5b466ac3c882..9bb33d4177ed 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -318,7 +318,7 @@ EOF for file in ~/.bash_profile ~/.bash_login ~/.profile ~/.zshenv ~/.zprofile ~/.zshrc ~/.zlogin; do if [ -f "$file" ]; then - if grep -l ".nix-profile" "$file"; then + if grep -l "^[^#].*.nix-profile" "$file"; then failure <<EOF I found a reference to a ".nix-profile" in $file. This has a high chance of breaking a new nix installation. It was most |