Skip to content

Use direct PATH manipulation to avoid conflicts with user's fish_user_paths #14691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abap34 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use direct PATH manipulation to avoid conflicts with user's fish_user_paths #14691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 3 additions & 8 deletions scripts/nix-profile-daemon.fish.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,9 @@ set --global --export __ETC_PROFILE_NIX_SOURCED 1
# Local helpers

function add_path --argument-names new_path
if type -q fish_add_path
# fish 3.2.0 or newer
fish_add_path --prepend --global $new_path
else
# older versions of fish
if not contains $new_path $fish_user_paths
set --global fish_user_paths $new_path $fish_user_paths
end
# Directly manipulate PATH to avoid conflicts with user's fish_user_paths
if not contains $new_path $PATH
set --global --export --prepend PATH $new_path
end
end

Expand Down
11 changes: 3 additions & 8 deletions scripts/nix-profile.fish.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,9 @@ set --global --export __ETC_PROFILE_NIX_SOURCED 1
# Local helpers

function add_path --argument-names new_path
if type -q fish_add_path
# fish 3.2.0 or newer
fish_add_path --prepend --global $new_path
else
# older versions of fish
if not contains $new_path $fish_user_paths
set --global fish_user_paths $new_path $fish_user_paths
end
# Directly manipulate PATH to avoid conflicts with user's fish_user_paths
if not contains $new_path $PATH
set --global --export --prepend PATH $new_path
end
end

Expand Down