github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-26 10:43:47 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Guard some contains calls in config.fish

Browse Source 
Fixes #3409.
This commit is contained in:
Fabian Homborg 2016-09-26 16:44:57 +02:00
parent f843eb3d31
commit 662ba60d63
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
share/config.fish
View File

@ -17,7 +17,7 @@ set -g version $FISH_VERSION
if status --is-interactive if status --is-interactive
# The user has seemingly explicitly launched an old fish with too-new scripts installed. # The user has seemingly explicitly launched an old fish with too-new scripts installed.
if not contains "string" (builtin -n) if not contains -- "string" (builtin -n)
set -g __is_launched_without_string 1 set -g __is_launched_without_string 1
# XXX nostring - fix old fish binaries with no `string' builtin. # XXX nostring - fix old fish binaries with no `string' builtin.
# When executed on fish 2.2.0, the `else' block after this would # When executed on fish 2.2.0, the `else' block after this would
@ -93,7 +93,7 @@ if not set -q fish_function_path
set fish_function_path $configdir/fish/functions $__fish_sysconfdir/functions $__extra_functionsdir $__fish_datadir/functions set fish_function_path $configdir/fish/functions $__fish_sysconfdir/functions $__extra_functionsdir $__fish_datadir/functions
end end
if not contains $__fish_datadir/functions $fish_function_path if not contains -- $__fish_datadir/functions $fish_function_path
set fish_function_path $fish_function_path $__fish_datadir/functions set fish_function_path $fish_function_path $__fish_datadir/functions
end end
@ -101,7 +101,7 @@ if not set -q fish_complete_path
set fish_complete_path $configdir/fish/completions $__fish_sysconfdir/completions $__extra_completionsdir $__fish_datadir/completions $userdatadir/fish/generated_completions set fish_complete_path $configdir/fish/completions $__fish_sysconfdir/completions $__extra_completionsdir $__fish_datadir/completions $userdatadir/fish/generated_completions
end end
if not contains $__fish_datadir/completions $fish_complete_path if not contains -- $__fish_datadir/completions $fish_complete_path
set fish_complete_path $fish_complete_path $__fish_datadir/completions set fish_complete_path $fish_complete_path $__fish_datadir/completions
end end
@ -114,7 +114,7 @@ end
# #
if test -d /usr/xpg4/bin if test -d /usr/xpg4/bin
if not contains /usr/xpg4/bin $PATH if not contains -- /usr/xpg4/bin $PATH
set PATH /usr/xpg4/bin $PATH set PATH /usr/xpg4/bin $PATH
end end
end end
@ -127,7 +127,7 @@ function __fish_load_path_helper_paths
set __fish_tmp_path $__fish_tmp_path[-1..1] set __fish_tmp_path $__fish_tmp_path[-1..1]
while read -l new_path_comp while read -l new_path_comp
if test -d $new_path_comp if test -d $new_path_comp
set -l where (contains -i $new_path_comp $__fish_tmp_path) set -l where (contains -i -- $new_path_comp $__fish_tmp_path)
and set -e __fish_tmp_path[$where] and set -e __fish_tmp_path[$where]
set __fish_tmp_path $new_path_comp $__fish_tmp_path set __fish_tmp_path $new_path_comp $__fish_tmp_path
end end
@ -147,13 +147,13 @@ function __fish_reconstruct_path -d "Update PATH when fish_user_paths changes" -
set -l local_path $PATH set -l local_path $PATH
set -l x set -l x
for x in $__fish_added_user_paths for x in $__fish_added_user_paths
set -l idx (contains --index $x $local_path) set -l idx (contains --index -- $x $local_path)
and set -e local_path[$idx] and set -e local_path[$idx]
end end
set -e __fish_added_user_paths set -e __fish_added_user_paths
for x in $fish_user_paths[-1..1] for x in $fish_user_paths[-1..1]
if set -l idx (contains --index $x $local_path) if set -l idx (contains --index -- $x $local_path)
set -e local_path[$idx] set -e local_path[$idx]
else else
set -g __fish_added_user_paths $__fish_added_user_paths $x set -g __fish_added_user_paths $__fish_added_user_paths $x