bash/rvm in rvm-0.0.14 vs bash/rvm in rvm-0.0.15
- old
+ new
@@ -1,11 +1,11 @@
#!/bin/bash
rvm_author="Wayne E. Seguin"
rvm_author_email="wayneeseguin@gmail.com"
rvm_website="http://github.com/wayneeseguin/rvm"
-rvm_version="0.0.14"
+rvm_version="0.0.15"
rvm_updated="2009.08.25"
#
# License: See LICENSE
#
@@ -181,10 +181,13 @@
rvm-log-info "\tInstalling $package_name"
make install > $install_path/$package_name/install.log 2> $install_path/$package_name/install.error.log
chmod +x $install_path/$package_name/bin/*
+ # Create the ~/.rvm/bin/$package_name
+ ln -s $install_path/$package_name/bin/ruby $install_path/bin/$package_name
+
# Now install rubygems for this ruby version.
rvm-log-info "\tInstalling rubygems dedicated to $package_name..."
gem_package_name="rubygems-1.3.5"
gem_url="http://rubyforge.org/frs/download.php/60718/$gem_package_name.tgz"
if [ -d $gem_package_name ] ; then
@@ -230,10 +233,12 @@
rvm-log-info "\tInstalling $package_name, this may take a while, depending on your cpu(s)..."
mkdir -p $install_path/$package_name
./installer -a $install_path/ruby-enterprise-$version-$patchlevel --dont-install-useful-gems > $install_path/$package_name/install.log 2> $install_path/$package_name/install.error.log
chmod +x $install_path/$package_name/bin/*
+ ln -s $install_path/$package_name/bin/ruby $install_path/bin/$package_name
+
rvm-log-info "\tInstalling rubygems dedicated to $package_name..."
gem_package_name="rubygems-1.3.5"
gem_url="http://rubyforge.org/frs/download.php/60718/$gem_package_name.tgz"
if [ -d $gem_package_name ] ; then
cd $gem_package_name
@@ -281,10 +286,13 @@
popd > /dev/null
chmod +x $install_path/$package_name/bin/*
for binary in jruby jgem jirb ; do
ln -sf $install_path/$package_name/bin/$binary $install_path/$package_name/bin/${binary#j}
done
+
+ ln -s $install_path/$package_name/bin/ruby $install_path/bin/$package_name
+
for gem_name in rake jruby-openssl ; do
rvm-log-info "Installing $gem_name"
$install_path/$package_name/bin/jgem install $gem_name --no-rdoc --no-ri -q >> $install_path/$package_name/gems.install.log
done
;;
@@ -427,16 +435,19 @@
*)
rvm-log-fail "Ruby implementation '$implementation' is not known."
esac
+ # Now actually use it.
if [ ! "$implementation" = "default" ] ; then
+ # Install if not installed
if [ ! -d $MY_RUBY_HOME ] ; then
rvm-log-warn "$implementation $version is not installed."
rvm-install-ruby $implementation $version $level
fi
+ # Set as 'current'
RUBY_VERSION="$($MY_RUBY_HOME/bin/ruby -v | sed 's/^\(.*\) (.*$/\1/')"
export GEM_HOME MY_RUBY_HOME RUBY_VERSION
echo "PATH=$MY_RUBY_HOME/bin:$GEM_HOME/bin:$default_path ; export PATH" > $install_path/current
for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME ; do
@@ -647,13 +658,13 @@
rvm-log-fail "root user support is not yet implemented."
#prefix_path=${prefix-/usr/local/}
else
prefix_path=${prefix-$HOME/.}
fi
- source_path="${source_path-"$prefix_path/src"}"
+ source_path="${source_path-"${prefix_path}rvm/src"}"
install_path="${prefix_path}rvm"
- mkdir -p $prefix_path $source_path $install_path
+ mkdir -p $prefix_path $source_path $install_path/bin
if [ ! -f $install_path/default ] ; then
for variable in RUBY_VERSION GEM_HOME MY_RUBY_HOME PATH ; do
eval "export $variable"
eval value=\$${variable}