Skip to content

Commit

Permalink
Adjust order of defaults loading.
Browse files Browse the repository at this point in the history
  • Loading branch information
wayneeseguin committed Feb 1, 2010
1 parent 1b5c55a commit 962a449
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions scripts/manage
Expand Up @@ -496,6 +496,7 @@ RubyWrapper

builtin cd $rvm_ruby_src_path

# MONO_LIB=/Library/Frameworks/Mono.framework/Versions/current/lib/
rvm_ruby_make="rake MERLIN_ROOT=\"$rvm_ruby_src_path/Merlin/Main\" compile mono=1 configuration=release --trace"
__rvm_run "rake" "$rvm_ruby_make" "Building IronRuby..."
if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
Expand Down
6 changes: 3 additions & 3 deletions scripts/rvm
Expand Up @@ -7,9 +7,6 @@
if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
unset rvm_reload_flag

if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi

if [[ -z "$rvm_path" ]] ; then
unset rvm_path
if [[ "root" = "$(whoami)" ]] ; then
Expand Down Expand Up @@ -39,6 +36,9 @@ if [[ "$rvm_loaded_flag" != "1" ]] || [[ "$rvm_reload_flag" = "1" ]] ; then
fi
fi

if [[ -f /etc/rvmrc ]] ; then source /etc/rvmrc ; fi
if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi

if [[ -d "$rvm_path" ]] ; then
source $rvm_scripts_path/array
source $rvm_scripts_path/utility
Expand Down

0 comments on commit 962a449

Please sign in to comment.