Skip to content

Commit

Permalink
Wow... that was a brainfart.
Browse files Browse the repository at this point in the history
  • Loading branch information
wayneeseguin committed Apr 25, 2011
1 parent ba44965 commit d9b240d
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 16 deletions.
5 changes: 2 additions & 3 deletions scripts/functions/env
Expand Up @@ -7,9 +7,8 @@
__rvm_default_flags()
{
:\
${rvm_head_flag:=0} ${rvm_ruby_string:=0} ${rvm_clang_flag:=0} \
${rvm_ruby_string:=0} ${rvm_clang_flag:=0} ${rvm_delete_flag:=0} \
${rvm_clang_flag:=0}
${rvm_head_flag:=0} ${rvm_clang_flag:=0} ${rvm_clang_flag:=0} \
${rvm_delete_flag:=0} ${rvm_clang_flag:=0}
}

__rvm_nuke_rvm_variables()
Expand Down
17 changes: 7 additions & 10 deletions scripts/rubygems
Expand Up @@ -32,10 +32,10 @@ rubygems_setup()
{
__rvm_warn_on_rubyopt

(( rvm_ruby_selected_flag == 1 )) || __rvm_select

unset RUBYOPT

(( rvm_ruby_selected_flag == 1 )) || __rvm_select

case "$rvm_ruby_string" in
jruby*|goru*)
install=0
Expand Down Expand Up @@ -89,21 +89,18 @@ rubygems_setup()
builtin cd "${rvm_src_path}/$rvm_gem_package_name"

__rvm_run "rubygems.install" \
"GEM_PATH=\"$rvm_ruby_gem_path:$rvm_ruby_global_gems_path\" GEM_HOME=\"$rvm_ruby_gem_home\" \"$rvm_ruby_home/bin/ruby\" \"${rvm_src_path}/$rvm_gem_package_name/setup.rb\"" \
"GEM_PATH=\"$GEM_PATH:${GEM_PATH%%@*}@global\" GEM_HOME=\"$GEM_HOME\" \"${rvm_ruby_binary}\" \"${rvm_src_path}/$rvm_gem_package_name/setup.rb\"" \
"Installing rubygems for $rvm_ruby_home/bin/ruby"
result=$?

if [[ "$result" == 0 ]] ; then

if (( result == 0 ))
then
rvm_log "Installation of rubygems completed successfully."

else

rvm_warn "Installation of rubygems did not complete successfully."

fi

if [[ ! -z "$rvm_ruby_major_version" ]] ; then
if [[ ! -z "$rvm_ruby_major_version" ]]
then
ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/${rvm_ruby_release_version}.${rvm_ruby_major_version}"
else
ruby_lib_gem_path="$rvm_ruby_home/lib/ruby/gems/$interpreter"
Expand Down
4 changes: 1 addition & 3 deletions scripts/selector
Expand Up @@ -15,9 +15,7 @@ __rvm_select()
[[ -n "${rvm_ruby_name:-""}" ]] && rvm_ruby_name="$rvm_ruby_string-$rvm_ruby_name"
fi

if ! __rvm_ruby_string ; then
return $?
fi
__rvm_ruby_string || return $?

rvm_archive_extension="tar.gz"

Expand Down

0 comments on commit d9b240d

Please sign in to comment.