Archives/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish synced 2024-11-03 15:40:32 +00:00
Code Issues Projects Releases Wiki Activity

fix #175: add /usr/local/sbin to PATH for brew

Browse Source
This commit is contained in:
Bruno Pinto 2014-07-16 00:36:20 -03:00
parent df2cf7e33e
commit 1e7e712f87
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/brew/brew.load
View File

@ -1,28 +1,24 @@
function _path_index #function _path_index
if test $PATH[$argv[1]] = $argv[2] # if test $PATH[$argv[1]] = $argv[2]
echo 'Path index correct' # echo 'Path index correct'
# end
#end
set -l brew_paths /usr/local/bin /usr/bin /bin /usr/local/sbin /usr/sbin /sbin
for brew_path in $brew_paths[-1..1]
if test -d $brew_path
set PATH $brew_path $PATH
end end
end end
# Set /usr/local/bin before /usr/bin if defined on $PATH set -l local_loop 7 #7 should be a variable derived from $brew_paths count + 1
if contains /usr/local/bin $PATH for i in (seq (count $PATH))[7..-1]
if contains /usr/bin $PATH if contains $PATH[$local_loop] $brew_paths
for i in (seq (count $PATH)) set -e PATH[$local_loop]
if test (_path_index $i '/usr/bin') else
set -g bin_index $i set local_loop (math "$local_loop + 1")
else
if test (_path_index $i '/usr/local/bin')
set -g local_bin_index $i
end
end
end
if test $bin_index -lt $local_bin_index
set PATH[$bin_index] /usr/local/bin
set PATH[$local_bin_index] /usr/bin
end
end end
end end
set -e bin_index set -e brew_paths
set -e local_bin_index set -e local_loop