github-mirror/oh-my-fish
2
0
Fork 0
mirror of https://github.com/oh-my-fish/oh-my-fish.git synced 2025-01-20 02:42:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #337 from daenney/rbenv_root_fixes

Browse Source
This commit is contained in:
Bruno Pinto 2015-02-01 02:47:29 -02:00
commit 76b9a2b60d
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/rbenv/rbenv.load
View File

@ -1,15 +1,28 @@
set -l rbenv_dir "$RBENV_ROOT" # Try to find rbenv by:
if [ ! $rbenv_dir ] # * Looking for $RBENV_BIN_ROOT/rbenv. This environment variable is specific to this plugin
set rbenv_dir $HOME/.rbenv # * Looking for rbenv on $PATH
# * Looking for rbenv in the user's home directory
# When necessary, prepend the bin/ directory containing rbenv to our $PATH.
if [ -e "$RBENV_BIN_ROOT/rbenv" ]
set rbenv_binary "$RBENV_BIN_ROOT/rbenv"
_prepend_path "$RBENV_BIN_ROOT"
else if [ (command command -v rbenv) ]
set rbenv_binary (command command -v rbenv)
else if [ -e "$HOME/.rbenv/bin/rbenv" ]
set rbenv_binary "$HOME/.rbenv/bin/rbenv"
_prepend_path "$HOME/.rbenv/bin"
else
echo "Could not find rbenv. Make sure it's on your system path, in your home directory or set the RBENV_BIN_ROOT environment variable pointing to the directory where you unpacked rbenv."
exit 1
end end
set -l supports_fish set -l supports_fish
set -l supports_fish_version '0.4.0' 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') set -l user_version (eval $rbenv_binary --version | sed -E 's/^rbenv ([[:digit:]\.]{2,}).*$/\1/g')
if [ $user_version = $supports_fish_version ] if [ $user_version = $supports_fish_version ]
set -l supports_fish_commits '56' set -l supports_fish_commits '56'
set -l user_commits (eval $rbenv_dir/bin/rbenv --version | sed -E 's/^.+-([[:digit:]]{1,}).+$/\1/g') set -l user_commits (eval $rbenv_binary --version | sed -E 's/^.+-([[:digit:]]{1,}).+$/\1/g')
if [ $user_commits -ge $supports_fish_commits ] if [ $user_commits -ge $supports_fish_commits ]
set supports_fish true set supports_fish true
end end
@ -25,9 +38,12 @@ else
end end
end end
_prepend_path $rbenv_dir/bin
if [ $supports_fish ] if [ $supports_fish ]
status --is-interactive; and source (eval $rbenv_dir/bin/rbenv init - | psub) status --is-interactive; and source (eval $rbenv_binary init - | psub)
else else
_prepend_path $rbenv_dir/shims if [ "$RBENV_ROOT" ]
_prepend_path "$RBENV_ROOT/shims"
else
_prepend_path "$HOME/.rbenv/shims"
end
end end