scripts/rvm in rvm-0.0.98 vs scripts/rvm in rvm-0.0.99

- old
+ new

@@ -13,12 +13,13 @@ if [[ -z "$rvm_path" ]] ; then unset rvm_path if [[ "root" = "$(whoami)" ]] ; then rvm_path="/usr/local/rvm" else - if [[ -d "$HOME/.rvm" ]] ; then rvm_path="$HOME/.rvm" ; fi - if [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then + if [[ -d "$HOME/.rvm" ]] && [[ -s "$HOME/.rvm/scripts/rvm" ]]; then + rvm_path="$HOME/.rvm" + elif [[ -d "/usr/local/rvm" ]] && [[ -s "/usr/local/rvm/scripts/rvm" ]] ; then rvm_path="${rvm_path:-"/usr/local/rvm"}" fi fi fi if [[ -d "$rvm_path" ]] ; then @@ -39,9 +40,11 @@ if [[ -s "$HOME/.rvm/default" ]] ; then source "$HOME/.rvm/default" elif [[ -s "$rvm_path/default" ]] ; then source "$rvm_path/default" + elif [[ -s "/usr/local/rvm/default" ]] ; then + source "/usr/local/rvm/default" fi else echo -e "\$rvm_path is not set. rvm cannot load." fi fi