scripts/rvm-install in rvm-0.1.33 vs scripts/rvm-install in rvm-0.1.34
- old
+ new
@@ -263,19 +263,19 @@
printf "\nUpgrade of RVM in $rvm_path/ is complete.\n\n"
else
if [[ "root" != "$(whoami)" ]] ; then
printf "\n$(tput setaf 1)You must now finish the install manually:$(tput sgr0)"
printf "\n1) Place the folowing line at the end of your shell's loading files(.bashrc or .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
- printf "\n if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+ printf "\n [[ -s \$HOME/scripts/rvm ]] && source \$HOME/scripts/rvm"
printf "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
printf "\n This means that if you see '[ -z "$PS1" ] && return' then you must change this line to:"
printf "\n if [[ ! -z "$PS1" ]] ; then"
printf "\n ... original content that was below the && return line ..."
printf "\n fi # <= be sure to close the if."
printf "\n #EOF .bashrc"
printf "\n Be absolutely *sure* to REMOVE the '&& return'."
- printf "\n If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
- printf "\n placing all non-interactive items in the .bashrc"
+ printf "\n If you wish to DRY up your config you can 'source ~/.bashrc' at the bottom of your .bash_profile."
+ printf "\n placing all non-interactive items in the .bashrc, including the 'source' line above"
printf "\n3) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
fi
if [[ -s $HOME/.bashrc ]] && grep '&& return' $HOME/.bashrc ; then
printf "\n\nWARNING: you have a 'return' statement in your .bashrc, likely this will cause untold havoc."
printf "\n This means that if you see '[ -z "\$PS1" ] && return' then you must change this line to:"