Browse files

Bugfix: jruby install now correctly symlinks the jbinaries to regular…

… and no longer alter's their shebangs.
  • Loading branch information...
1 parent 301fe7b commit 839e7e8998709ecfebe4a3a6460024ae127bdfdd @wayneeseguin wayneeseguin committed Dec 2, 2009
Showing with 15 additions and 14 deletions.
  1. +7 −4 scripts/ruby-installer
  2. +1 −4 scripts/rvm
  3. +7 −6 scripts/utility
View
11 scripts/ruby-installer
@@ -221,7 +221,7 @@ RubyWrapper
__rvm_inject_gem_env "$rvm_ruby_gem_home/bin/rake"
__rvm_irbrc
- __rvm_bin_scripts
+ __rvm_bin_script
__rvm_post_install
__rvm_pushpop
else
@@ -343,7 +343,7 @@ RubyWrapper
fi ; unset binary
__rvm_irbrc
- __rvm_bin_scripts
+ __rvm_bin_script
;;
jruby)
@@ -404,13 +404,16 @@ RubyWrapper
done ; unset binary
__rvm_pushpop
- for binary in rake rdoc ri spec autospec \
- testrb jrubyc jirb_swing jirb jgem ast generate_yaml_index.rb; do
+ for binary in rake rdoc ri spec autospec testrb ast generate_yaml_index.rb ; do
__rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
__rvm_inject_gem_env $rvm_ruby_home/bin/$binary
chmod +x $rvm_ruby_home/bin/$binary
done ; unset binary
+ for binary in jrubyc jirb_swing jirb jgem ; do
+ __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
+ done
+
__rvm_rubygems_setup
__rvm_irbrc
__rvm_bin_script
View
5 scripts/rvm
@@ -5,10 +5,7 @@
# http://gitub.com/wayneeseguin/rvm
if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
- if [[ ! -z "$rvm_reload_flag" ]] ; then
- unset rvm_reload_flag
- while [[ $# -gt 0 ]] ; do shift ; done
- fi
+ unset rvm_reload_flag
if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi
View
13 scripts/utility
@@ -144,12 +144,13 @@ __rvm_load_rvmrc() {
}
__rvm_bin_scripts() {
- for rvm_ruby_binary in $(\ls $rvm_path/*/bin/ruby 2> /dev/null) ; do
- if [[ -x "$rvm_ruby_binary" ]] ; then
- rvm_ruby_string=$(dirname "$rvm_ruby_binary" | xargs dirname | xargs basename)
- __rvm_select
- __rvm_bin_script
- fi
+ # for rvm_ruby_binary in $(\ls $rvm_path/*/bin/ruby 2> /dev/null) ; do
+ for rvm_ruby_binary in $rvm_path/*/bin/ruby ; do
+ if [[ -x "$rvm_ruby_binary" ]] ; then
+ rvm_ruby_string=$(dirname "$rvm_ruby_binary" | xargs dirname | xargs basename)
+ __rvm_select
+ __rvm_bin_script
+ fi
done
}

0 comments on commit 839e7e8

Please sign in to comment.