Skip to content

O
oh-my-fish
Commit 513f19c8 authored by Wolfgang Richter's avatar Wolfgang Richter Committed by Bruno Pinto
Browse files
Options

oh-my-fish.fish: ensure duplicates aren't prepended to fish_function_path

parent 241e2a40
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 5 deletions
oh-my-fish.fish
View file @ 513f19c8
......@@ -6,11 +6,14 @@ function _fish_add_plugin
set -l plugin $argv[1]
set -l plugin_path "plugins/$plugin"
if test -d $fish_path/$plugin_path
echo 'adding plugin'
if begin; test -d $fish_path/$plugin_path; and not contains \
$fish_path/$plugin_path $fish_function_path; end
set fish_function_path $fish_path/$plugin_path $fish_function_path
end
if test -d $fish_custom/$plugin_path
if begin; test -d $fish_custom/$plugin_path; and not contains \
$custom_path/$plugin_path $fish_function_path; end
set fish_function_path $fish_custom/$plugin_path $fish_function_path
end
end
......@@ -42,11 +45,13 @@ function _fish_source_plugin_load_file
end
function _fish_load_theme
if test -d $fish_path/themes/$fish_theme
if begin; test -d $fish_path/themes/$fish_theme; and not contains \
$fish_custom/themes/$fish_theme $fish_function_path; end
set fish_function_path $fish_path/themes/$fish_theme $fish_function_path
end
if test -d $fish_custom/themes/$fish_theme
if begin; test -d $fish_custom/themes/$fish_theme; and not contains \
$fish_custom/themes/$fish_theme $fish_function_path; end
set fish_function_path $fish_custom/themes/$fish_theme $fish_function_path
end
end
......@@ -66,7 +71,9 @@ set user_function_path $fish_function_path[1]
set -e fish_function_path[1]
# Add all functions
set fish_function_path $fish_path/functions/ $fish_function_path
if not contains $fish_path/functions/ $fish_function_path
set fish_function_path $fish_path/functions/ $fish_function_path
end
# Add all defined plugins
for plugin in $fish_plugins
......@@ -84,4 +91,9 @@ for config_file in $fish_custom/*.load
end
# Re-adding user's functions so they have the highest priority
if contains $user_function_path $fish_function_path
set -e fish_function_path[(contains -i $user_function_path \
$fish_function_path)]
end
set fish_function_path $user_function_path $fish_function_path
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment