diff options
| author | Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> | 2023-03-02 19:20:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-02 19:20:51 +0100 |
| commit | 1f394d2107fd2de511ab95516c1ea77f31a2baaa (patch) | |
| tree | fefb6d3346fca06513744ffd42d34ff1add0ca14 /scripts | |
| parent | 639659dec22ed0016ce83dce79ff2aa46d83b0ab (diff) | |
| parent | 3a2b3af82428dd691b1871243e44daeff9920fb4 (diff) | |
Merge branch 'master' into paths-from-stdin
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/nix-profile-daemon.sh.in | 2 | ||||
| -rw-r--r-- | scripts/nix-profile.sh.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/nix-profile-daemon.sh.in b/scripts/nix-profile-daemon.sh.in index 80774f1f2..8cfd3149e 100644 --- a/scripts/nix-profile-daemon.sh.in +++ b/scripts/nix-profile-daemon.sh.in @@ -8,7 +8,7 @@ if [ -n "${XDG_STATE_HOME-}" ]; then else NIX_LINK_NEW=$HOME/.local/state/nix/profile fi -if ! [ -e "$NIX_LINK" ]; then +if [ -e "$NIX_LINK_NEW" ]; then NIX_LINK="$NIX_LINK_NEW" else if [ -t 2 ] && [ -e "$NIX_LINK_NEW" ]; then diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in index e8af91211..c4d60cf37 100644 --- a/scripts/nix-profile.sh.in +++ b/scripts/nix-profile.sh.in @@ -8,7 +8,7 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then else NIX_LINK_NEW="$HOME/.local/state/nix/profile" fi - if ! [ -e "$NIX_LINK" ]; then + if [ -e "$NIX_LINK_NEW" ]; then NIX_LINK="$NIX_LINK_NEW" else if [ -t 2 ] && [ -e "$NIX_LINK_NEW" ]; then |