Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Use subshells directly to import the gemset stuff
  • Loading branch information
Sutto committed Jun 3, 2010
1 parent d636bf2 commit b39a347
Showing 1 changed file with 3 additions and 24 deletions.
27 changes: 3 additions & 24 deletions scripts/gemsets
Expand Up @@ -342,39 +342,18 @@ gemset_initial() {
for gemsets_path in "$rvm_gemsets_path" "$rvm_gemsets_path/$rvm_ruby_interpreter" "$rvm_gemsets_path/$rvm_ruby_interpreter/$rvm_ruby_version" "$rvm_gemsets_path/$rvm_ruby_interpreter/$rvm_ruby_version/$rvm_ruby_patch_level" ; do
if [[ ! -z "$rvm_gemset_name" ]] ; then
if [[ -s "${gemsets_path}/${rvm_gemset_name}.gems" ]] ; then
printf $(rvm gemset import "${gemsets_path}/${rvm_gemset_name}.gems") > /dev/null
(source "$rvm_scripts_path/rvm"; rvm gemset import "${gemsets_path}/${rvm_gemset_name}.gems") > /dev/null
fi
else
if [[ -d "$gemsets_path" ]] && [[ -s "${gemsets_path}/default.gems" ]] ; then
printf $(rvm gemset import "$gemsets_path/default.gems") > /dev/null
(source "$rvm_scripts_path/rvm"; rvm gemset import "$gemsets_path/default.gems") > /dev/null
fi
if [[ -d "$gemsets_path" ]] && [[ -s "${gemsets_path}/global.gems" ]] ; then
printf $(rvm use "$rvm_ruby_string@global" --create ; rvm gemset import "${gemsets_path}/global.gems") > /dev/null
(source "$rvm_scripts_path/rvm"; rvm use "$rvm_ruby_string@global" --create ; rvm gemset import "${gemsets_path}/global.gems") > /dev/null
fi
fi
done
$rvm_scripts_path/log "info" "Installation of gems for $(__rvm_environment_identifier) is complete."

# Original code, which swapped out the environments on the fly.
#post_install_gems="rdoc rake"
#for rvm_gem_name in $(echo $post_install_gems); do
# home="$GEM_HOME" ; path="$GEM_PATH" # Save
# for dir in $rvm_ruby_global_gems_path $rvm_ruby_gem_home ; do
# GEM_HOME="$dir" ; GEM_PATH="$dir" ; BUNDLE_PATH="$dir"
# export GEM_HOME GEM_PATH BUNDLE_PATH
# __rvm_run "gems.install" "$rvm_ruby_home/bin/gem install --no-rdoc --no-ri $rvm_gem_name $rvm_gem_options" "Installing $rvm_gem_name to $dir"

# if [[ -x $rvm_ruby_gem_home/bin/$rvm_gem_name ]] ; then
# if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] && [[ ! -x $rvm_ruby_home/bin/$rvm_gem_name ]] ; then
# ln -nfs $rvm_ruby_gem_home/bin/$rvm_gem_name $rvm_ruby_home/bin/$rvm_gem_name
# fi
# __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$rvm_gem_name"
# __rvm_inject_gem_env "$rvm_ruby_home/bin/$rvm_gem_name"
# fi
# done ; unset home path dir
# GEM_HOME="$home" ; GEM_PATH="$path" ; BUNDLE_PATH="$home"
# export GEM_HOME GEM_PATH BUNDLE_PATH
#done ; unset rvm_gem_name post_install_gems
}

unset GEM_PATH
Expand Down

0 comments on commit b39a347

Please sign in to comment.