scripts/rvm-install in rvm-0.0.78 vs scripts/rvm-install in rvm-0.0.79

- old
+ new

@@ -1,13 +1,15 @@ #!/usr/bin/env bash rc_files="$HOME/.bash_profile $HOME/.bashrc $HOME/.zshrc" +if [[ -f "/etc/rvmrc" ]] ; then source "/etc/rvmrc" ; fi if [[ "root" = "$(whoami)" ]] ; then - rvm_path=/usr/local/rvm + rvm_path="${rvm_path:-/usr/local/rvm}" rc_files="$rc_files /etc/profile /etc/zshenv" else - rvm_path=$HOME/.rvm + if [[ -f "$HOME/.rvmrc" ]] ; then source "$HOME/.rvmrc" ; fi + rvm_path="${rvm_path:-$HOME/.rvm}" fi # # Setup # @@ -71,22 +73,22 @@ rvm_pacman_binary="$(which pacman 2> /dev/null)" rvm_yum_binary="$(which yum 2> /dev/null)" if [[ ! -z "$rvm_apt_get_binary" ]] ; then echo -e " $item For jRuby (if you wish to use it) you will need:" - echo -e " $ sudo aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk" + echo -e " $ aptitude install sun-java6-bin sun-java6-jre sun-java6-jdk" echo -e " $item For ree (if you wish to use it) you will need:" - echo -e " $ sudo aptitude install libreadline5-dev libssl-dev bison" + echo -e " $ aptitude install libreadline5-dev libssl-dev bison" echo -e " $item For 1.9.X (if you wish to use it) we additionally recommend:" - echo -e " $ sudo aptitude install libxml2-dev" + echo -e " $ aptitude install libxml2-dev" elif [[ ! -z "$rvm_emerge_binary" ]] ; then echo -e " $item For jRuby (if you wish to use it) you will need:" - echo -e " $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin" + echo -e " $ emerge dev-java/sun-jdk dev-java/sun-jre-bin" elif [[ ! -z "$rvm_pacman_binary" ]] ; then echo -e " $item For jRuby (if you wish to use it) you will need:" - echo -e " $ sudo pacman -Sy jdk jre" + echo -e " $ pacman -Sy jdk jre" elif [[ ! -z "$rvm_yum_binary" ]] ; then echo -e " $item For ree (if you wish to use it) you will need:" echo -e " $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."