Skip to content

Commit 20365e3

Browse files
committed
Remove jruby-specific fix in rbenv hook for finding standard gem install path (this was actually fixed by the earlier recursion fix, and should have been removed then). Thanks to @neovatar for starting me down this path (https://github.com/neovatar/rbenv-gemset/commit/ef779f42416373ad98b7a527b06b3ada5e48bf7e)!
Also bump version to 0.5.*6*! (0.5.5 should have been the last commit)
1 parent 37c8f91 commit 20365e3

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

README.mkd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ a per-application basis) which sets of gems should be used.
2929

3030
### GitHub
3131

32-
Download and extract the [latest release](https://github.com/jf/rbenv-gemset/releases/latest) (v0.5.4 now!) or clone rbenv-gemset to your `$HOME/.rbenv/plugins` directory:
32+
Download and extract the [latest release](https://github.com/jf/rbenv-gemset/releases/latest) (v0.5.6 now!) or clone rbenv-gemset to your `$HOME/.rbenv/plugins` directory:
3333

3434
$ mkdir ~/.rbenv/plugins
3535
$ cd ~/.rbenv/plugins

etc/rbenv.d/exec/gemset.bash

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,7 @@ for gemset in $(rbenv-gemset active 2>/dev/null); do
3030
done
3131
IFS="$OLDIFS"
3232

33-
set +e
34-
WHICH_JRUBY=$(rbenv which jruby 2>/dev/null)
35-
set -e
36-
if [[ "$WHICH_JRUBY" != "" ]]; then
37-
GEM_PATH="$GEM_PATH:$("$(rbenv which jruby)" "$(rbenv which gem)" env gemdir)"
38-
else
39-
GEM_PATH="$GEM_PATH:$("$(rbenv which gem)" env gemdir)"
40-
fi
33+
GEM_PATH="$GEM_PATH:$("$(rbenv which gem)" env gemdir)"
4134

4235
if [ -n "$GEM_HOME" ]; then
4336
export GEM_HOME GEM_PATH PATH

libexec/rbenv-gemset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22
set -e
33

4-
RBENV_GEMSET_VERSION="0.5.3"
4+
RBENV_GEMSET_VERSION="0.5.6"
55

66
# Provide rbenv completions
77
if [ "$1" = "--complete" ]; then

0 commit comments

Comments
 (0)