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

Merge pull request #207 from charlesbjohnson/fix_rbenv_plugin_shell_command

Browse Source 
Fix issue with rbenv plugin where some rbenv commands fail
This commit is contained in:
Bruno 2015-01-01 20:52:33 -02:00
commit 25dbd9ad48
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/rbenv/rbenv.fish
View File

@ -9,4 +9,3 @@ function rbenv
command rbenv "$command" $argv command rbenv "$command" $argv
end end
end end

38
plugins/rbenv/rbenv.load
View File

@ -1,7 +1,33 @@
if test -n "$RBENV_ROOT" set -l rbenv_dir "$RBENV_ROOT"
_prepend_path $RBENV_ROOT/bin if [ ! $rbenv_dir ]
_prepend_path $RBENV_ROOT/shims set rbenv_dir $HOME/.rbenv
else end
_prepend_path $HOME/.rbenv/bin
_prepend_path $HOME/.rbenv/shims set -l supports_fish
set -l supports_fish_version '0.4.0'
set -l user_version (eval $rbenv_dir/bin/rbenv --version | sed -E 's/^rbenv ([[:digit:]\.]{2,}).*$/\1/g')
if [ $user_version = $supports_fish_version ]
set -l supports_fish_commits '56'
set -l user_commits (eval $rbenv_dir/bin/rbenv --version | sed -E 's/^.+-([[:digit:]]{1,}).+$/\1/g')
if [ $user_commits -ge $supports_fish_commits ]
set supports_fish true
end
else
set -l higher_version (echo -e "$supports_fish_version\n$user_version" | \
sort --field-separator . \
--key 1,1 --numeric-sort --reverse \
--key 2,2 --numeric-sort --reverse \
--key 3,3 --numeric-sort --reverse | \
head -n 1)
if [ $user_version = $higher_version ]
set supports_fish true
end
end
_prepend_path $rbenv_dir/bin
if [ $supports_fish ]
status --is-interactive; and source (eval $rbenv_dir/bin/rbenv init - | psub)
else
_prepend_path $rbenv_dir/shims
end end