Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bugfix: jruby install now correctly symlinks the jbinaries to regular…
… and no longer alter's their shebangs.
  • Loading branch information
wayneeseguin committed Dec 3, 2009
1 parent 301fe7b commit 839e7e8
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 14 deletions.
11 changes: 7 additions & 4 deletions scripts/ruby-installer
Expand Up @@ -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
Expand Down Expand Up @@ -343,7 +343,7 @@ RubyWrapper
fi ; unset binary

__rvm_irbrc
__rvm_bin_scripts
__rvm_bin_script
;;

jruby)
Expand Down Expand Up @@ -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
Expand Down
5 changes: 1 addition & 4 deletions scripts/rvm
Expand Up @@ -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
Expand Down
13 changes: 7 additions & 6 deletions scripts/utility
Expand Up @@ -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
}

Expand Down

0 comments on commit 839e7e8

Please sign in to comment.