diff options
Diffstat (limited to 'scripts/install-darwin-multi-user.sh')
| -rw-r--r-- | scripts/install-darwin-multi-user.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/install-darwin-multi-user.sh b/scripts/install-darwin-multi-user.sh index 5b466ac3c882..cea25eb8adf3 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 @@ -730,13 +730,13 @@ configure_shell_profile() { setup_default_profile() { _sudo "to installing a bootstrapping Nix in to the default Profile" \ - -i "$NIX_INSTALLED_NIX/bin/nix-env" -i "$NIX_INSTALLED_NIX" + HOME=$ROOT_HOME "$NIX_INSTALLED_NIX/bin/nix-env" -i "$NIX_INSTALLED_NIX" _sudo "to installing a bootstrapping SSL certificate just for Nix in to the default Profile" \ - -i "$NIX_INSTALLED_NIX/bin/nix-env" -i "$NIX_INSTALLED_CACERT" + HOME=$ROOT_HOME "$NIX_INSTALLED_NIX/bin/nix-env" -i "$NIX_INSTALLED_CACERT" _sudo "to update the default channel in the default profile" \ - -i NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt "$NIX_INSTALLED_NIX/bin/nix-channel" --update nixpkgs + HOME=$ROOT_HOME NIX_SSL_CERT_FILE=/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt "$NIX_INSTALLED_NIX/bin/nix-channel" --update nixpkgs } |