scripts/ruby-installer in rvm-0.0.53 vs scripts/ruby-installer in rvm-0.0.54
- old
+ new
@@ -265,14 +265,10 @@
__rvm_irbrc
__rvm_bin_scripts
;;
jruby)
- rvm_package_file="$rvm_ruby_interpreter-bin-$rvm_ruby_version"
- rvm_url="http://dist.codehaus.org/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_package_file.zip"
- rvm_jruby_repo_url="${rvm_jruby_repo_url:-"git://kenai.com/jruby~main"}"
-
mkdir -p $rvm_ruby_log_path
__rvm_pushpop $rvm_source_path
if [ ! -z "$rvm_ruby_rev" ] ; then
if [ ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version -o ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version/.git ] ; then
@@ -287,14 +283,12 @@
__rvm_log "info" "It appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
else
__rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
__rvm_fetch $rvm_url
fi
- rvm_unzip=`which unzip`
- if [ $? -ne 0 ] ; then
- __rvm_log "error" "'unzip' was not found in your PATH. jRuby official release comes as a .zip file, hence 'unzip' is required to extract it. Please install 'unzip' and try again."
- else
- __rvm_run "extract" "unzip -q $rvm_archives_path/$rvm_package_file.zip -d $rvm_source_path" "Extracting $rvm_package_file..."
+ __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_source_path" "Extracting $rvm_package_file..."
+ if [ "$rvm_package_file" != "$rvm_ruby_string" ] ; then
+ mv $rvm_source_path/$rvm_package_file $rvm_source_path/$rvm_ruby_string
fi
cd $rvm_ruby_src_path
fi
fi