Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

make sure ruby 1.8.5 does not install new rubygems, fix #1365

  • Loading branch information...
commit 0e213805b5afa509b4faa629ada31c8f4868e19c 1 parent 7e0cad5
Michal Papis mpapis authored
2  gemsets/ruby/1.8.5/global.gems
View
@@ -0,0 +1,2 @@
+
+
2  scripts/functions/utility
View
@@ -625,7 +625,7 @@ __rvm_gemsets_initial()
then
__rvm_run_with_env "gemsets.initial" "$rvm_ruby_string" \
"'$rvm_scripts_path/gemsets' initial" \
- "$rvm_ruby_string - #importing default gemsets ($rvm_gemsets_path/), this may take time ..."
+ "$rvm_ruby_string - #importing default gemsets, this may take time ..."
else
mkdir -p "$rvm_gems_path/$rvm_ruby_string@global/bin"
rvm_log "Skipped importing default gemsets"
10 scripts/gemsets
View
@@ -878,12 +878,10 @@ gemset_initial()
rvm_log "Importing initial gemsets for $(__rvm_env_string)."
- if [[ ! -d "$rvm_gemsets_path/${rvm_ruby_string//-//}/cache" ]]
- then
+ [[ -d "$rvm_gemsets_path/${rvm_ruby_string//-//}/cache" ]] ||
mkdir -p "$rvm_gemsets_path/${rvm_ruby_string//-//}/cache" 2>/dev/null
- fi
- paths=($(__rvm_ruby_string_paths_under "$rvm_gemsets_path"))
+ paths=( $( __rvm_ruby_string_paths_under "$rvm_gemsets_path" | sort -r ) )
echo "paths: ${paths[@]}"
@@ -894,6 +892,7 @@ gemset_initial()
if [[ -s "${rvm_gemset_name}.gems" ]]
then
( gemset_import "${rvm_gemset_name}.gems" )
+ break # stop right here
fi
else
if [[ -s "${_iterator}/default.gems" ]]
@@ -908,6 +907,9 @@ gemset_initial()
gemset_import "${_iterator}/global.gems"
)
fi
+ if [[ -s "${_iterator}/default.gems" || -s "${_iterator}/global.gems" ]]
+ then break # stop right here
+ fi
fi
done
rvm_log "Installation of gems for $(__rvm_env_string) is complete."
Please sign in to comment.
Something went wrong with that request. Please try again.