Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Feature: rvm_symlink_path now overridable and defaults to /usr/local/bin

  • Loading branch information...
commit ec137f284a8085ed974f9ec46cecd15c32324f24 1 parent b8e2a15
@wayneeseguin wayneeseguin authored
Showing with 7 additions and 6 deletions.
  1. +1 −0  scripts/initialize
  2. +1 −1  scripts/install
  3. +5 −5 scripts/selector
View
1  scripts/initialize
@@ -17,6 +17,7 @@ rvm_gem_path="${rvm_gem_path:-"$rvm_path/gems"}"
rvm_config_path="${rvm_config_path:-"$rvm_path/config"}"
rvm_hooks_path="${rvm_hooks_path:-"$rvm_path/hooks"}"
rvm_tmp_path="${rvm_tmp_path:-"$rvm_path/tmp"}"
+rvm_symlink_path="${rvm_symlink_path:-/usr/local/bin}"
export rvm_path rvm_scripts_path rvm_archives_path rvm_src_path rvm_log_path rvm_bin_path rvm_gem_path rvm_config_path rvm_tmp_path
View
2  scripts/install
@@ -66,7 +66,7 @@ if [[ "$rvm_loaded_flag" != "1" ]] ; then
fi
if [[ "root" = "$(whoami)" ]] ; then
- ln -nfs $rvm_path/scripts/rvm /usr/local/bin/rvm
+ ln -nfs $rvm_path/scripts/rvm $rvm_symlink_path/rvm
else
ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
fi
View
10 scripts/selector
@@ -196,7 +196,7 @@ __rvm_use() {
if [[ "root" = "$(whoami)" ]] ; then
for binary in erb gem irb rake rdoc ri ruby testrb ; do
- rm -f /usr/local/bin/$binary
+ rm -f $rvm_symlink_path/$binary
done
fi
@@ -239,10 +239,10 @@ __rvm_use() {
if [[ "root" = "$(whoami)" ]] ; then
for binary in erb gem irb rake rdoc ri ruby testrb ; do
- rm -f /usr/local/bin/$binary
- ln -nfs $rvm_ruby_home/bin/$binary /usr/local/bin/$binary
- rm -f /usr/local/bin/passenger_ruby
- ln -nfs $rvm_bin_path/$rvm_ruby_string /usr/local/bin/passenger_ruby
+ rm -f $rvm_symlink_path/$binary
+ ln -nfs $rvm_ruby_home/bin/$binary $rvm_symlink_path/$binary
+ rm -f $rvm_symlink_path/passenger_ruby
+ ln -nfs $rvm_bin_path/$rvm_ruby_string $rvm_symlink_path/passenger_ruby
done
fi
fi
Please sign in to comment.
Something went wrong with that request. Please try again.