scripts/ruby-installer in rvm-0.0.72 vs scripts/ruby-installer in rvm-0.0.73
- old
+ new
@@ -340,30 +340,26 @@
if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
fi
cd "$rvm_ruby_src_path"
ant dist
-
else
- if [[ -d $rvm_ruby_src_path ]] ; then
- cd $rvm_ruby_src_path
+ if [[ -z "$rvm_force_flag" ]] && [[ -f $rvm_package_file ]] && [[ -s $rvm_package_file ]] ; then
+ __rvm_log "info" "It appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
else
- if [[ -z "$rvm_force_flag" ]] && [[ -f $rvm_package_file ]] && [[ -s $rvm_package_file ]] ; then
- __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_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_package_file..."
- if [[ "$rvm_package_file" != "$rvm_ruby_string" ]] ; then
- mv $rvm_src_path/$rvm_package_file $rvm_src_path/$rvm_ruby_string
- fi
- cd $rvm_ruby_src_path
+ __rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
+ __rvm_fetch "$rvm_url"
fi
+ __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_package_file..."
+ if [[ "$rvm_package_file" != "$rvm_ruby_string" ]] ; then
+ mv "$rvm_src_path/$rvm_package_file" "$rvm_src_path/$rvm_ruby_string"
+ fi
+ cd "$rvm_ruby_src_path"
fi
- mkdir -p $rvm_ruby_home/bin/
- __rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && /usr/bin/make $rvm_make_flags" "Installing $rvm_ruby_package_name..."
+ mkdir -p "$rvm_ruby_home/bin/"
+ cd "$rvm_ruby_src_path/tool/nailgun" && /usr/bin/make $rvm_make_flags
+
__rvm_pushpop
if [[ -z "$rvm_ruby_home" ]] || [[ "$rvm_ruby_home" = "/" ]] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
rm -rf $rvm_ruby_home
__rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing JRuby to $rvm_ruby_home"