bash/rvm in rvm-0.0.19 vs bash/rvm in rvm-0.0.20

- old
+ new

@@ -1,11 +1,11 @@ #!/bin/bash rvm_author="Wayne E. Seguin" rvm_author_email="wayneeseguin@gmail.com" rvm_website="http://rvm.beginrescueend.com/" -rvm_version="0.0.19" +rvm_version="0.0.20" rvm_updated="2009.08.25" # # License: See LICENSE # @@ -181,11 +181,11 @@ if [ -d $package_name ] ; then cd $package_name else if [ ! -f "$package_name.tar.gz" ] ; then rvm-log-info "\tDownloading $package_name, this may take a while depending on your connection..." - $curl $url + eval $curl $url fi rvm-log-info "\tExtracting $package_name..." tar xzf $package_name.tar.gz && cd $package_name fi @@ -207,11 +207,11 @@ 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 else - if [ ! -f $gem_package_name.tgz ] ; then $curl $gem_url ; fi + if [ ! -f $gem_package_name.tgz ] ; then eval $curl $gem_url ; fi tar zxf $gem_package_name.tgz && cd $gem_package_name fi # Well this is fun... fix nil error on require_paths: sed -i '' "s/require_paths\.join/require_paths.to_a.join/" $source_path/$package_name/$gem_package_name/lib/rubygems/gem_path_searcher.rb $install_path/$package_name/bin/ruby ./setup.rb > $install_path/$package_name/rubygems.install.log 2> $install_path/$package_name/rubygems.install.error.log @@ -242,11 +242,11 @@ if [ -d $package_name ] ; then cd $package_name else if [ ! -f "$package_name.tar.gz" ] ; then rvm-log-info "\tDownloading $package_name, this may take a while depending on your connection..." - $curl $url + eval $curl $url fi rvm-log-info "\tExtracting $package_name..." tar xzf $package_name.tar.gz && cd $package_name fi @@ -261,11 +261,11 @@ 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 else - if [ ! -f $gem_package_name.tgz ] ; then $curl $gem_url ; fi + if [ ! -f $gem_package_name.tgz ] ; then eval $curl $gem_url ; fi tar zxf $gem_package_name.tgz && cd $gem_package_name fi # Well this is fun... fix nil error on require_paths: sed -i '' "s/require_paths\.join/require_paths.to_a.join/" $source_path/$package_name/$gem_package_name/lib/rubygems/gem_path_searcher.rb $install_path/$package_name/bin/ruby ./setup.rb > $install_path/$package_name/rubygems.install.log 2> $install_path/$package_name/rubygems.install.error.log @@ -291,11 +291,11 @@ if [ -d $zipfile ] ; then cd $zipfile else if [ ! -f "$zipfile.zip" ] ; then rvm-log-info "\tDownloading $zipfile, this may take a while depending on your connection..." - $curl $url + eval $curl $url fi rvm-log-info "\tExtracting $zipfile..." jar xf $zipfile.zip fi @@ -349,11 +349,11 @@ ;; ree) version=${version-1.8.6} if [ "$version" = "1.8.6" ] ; then - package_name="$install_path/ruby-enterprise-$version-${3-20090610}" + package_name="ruby-enterprise-$version-${3-20090610}" else rvm-log-fail "Unknown Ruby Enterprise Edition version: $version" fi ;; @@ -381,10 +381,10 @@ esac if [ ! -z "$package_name" ] ; then for path in $source_path $install_path ; do if [ -d $path/$package_name ] ; then - rvm-log-info "Removing $path/$package_name" + rvm-log-info "Removing $path/$package_name..." rm -rf $path/$package_name fi done else rvm-log-fail "Cannot uninstall unknown package '$package_name'"