Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ab4dd1d78306
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 37e45dac8c60
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 19, 2019

  1. Fix unset variable in installer

    @steshaw
    steshaw committed Oct 19, 2019
    Copy the full SHA
    f0ec4b4 View commit details

Commits on Oct 21, 2019

  1. Merge pull request #3158 from steshaw/master 

    Fix unset variable in installer
    @edolstra
    edolstra authored Oct 21, 2019
    Copy the full SHA
    37e45da View commit details
Showing with 1 addition and 4 deletions.
  1. +1 −4 scripts/install-nix-from-closure.sh
5 changes: 1 addition & 4 deletions scripts/install-nix-from-closure.sh
View file
Original file line number Diff line number Diff line change
@@ -141,11 +141,9 @@ if [ -z "$_NIX_INSTALLER_TEST" ]; then
fi

added=
p=$HOME/.nix-profile/etc/profile.d/nix.sh
if [ -z "$NIX_INSTALLER_NO_MODIFY_PROFILE" ]; then

# Make the shell source nix.sh during login.
p=$HOME/.nix-profile/etc/profile.d/nix.sh

for i in .bash_profile .bash_login .profile; do
fn="$HOME/$i"
if [ -w "$fn" ]; then
@@ -157,7 +155,6 @@ if [ -z "$NIX_INSTALLER_NO_MODIFY_PROFILE" ]; then
break
fi
done

fi

if [ -z "$added" ]; then