Only add Nix paths to $PATH if not already in there

This fixes the paths being added multiple times if the user logs out and back in.
NixOS · Nov 5, 2023 · 92110c2 · 92110c2
1 parent 8e222fb
commit 92110c2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/scripts/nix-profile-daemon.sh.in b/scripts/nix-profile-daemon.sh.in
@@ -60,5 +60,8 @@ else
   unset -f check_nix_profiles
 fi
 
-export PATH="$NIX_LINK/bin:@localstatedir@/nix/profiles/default/bin:$PATH"
+if ! [[ "$PATH" =~ "$NIX_LINK/bin:@localstatedir@/nix/profiles/default/bin:" ]]; then
+    export PATH="$NIX_LINK/bin:@localstatedir@/nix/profiles/default/bin:$PATH"
+fi
+
 unset NIX_LINK
diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
@@ -54,6 +54,9 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
         export MANPATH="$NIX_LINK/share/man:$MANPATH"
     fi
 
-    export PATH="$NIX_LINK/bin:$PATH"
+    if ! [[ "$PATH" =~ "$NIX_LINK/bin:" ]]; then
+        export PATH="$NIX_LINK/bin:$PATH"
+    fi
+
     unset NIX_LINK NIX_LINK_NEW
 fi