From b03066835c43a3ad183ae2e70b17ac1eab7aba1c Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Mon, 2 Oct 2017 20:07:56 -0400 Subject: [PATCH] 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 `#`. (cherry picked from commit 92f9d18aa030805189b7bf31bb1d129c49edc83f) --- scripts/install-darwin-multi-user.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 8ae1c9a20..6d8c29603 100644 --- a/scripts/install-darwin-multi-user.sh +++ b/scripts/install-darwin-multi-user.sh @@ -336,7 +336,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 <