scripts/rvm-install in rvm-0.1.39 vs scripts/rvm-install in rvm-0.1.40

- old
+ new

@@ -21,10 +21,17 @@ --help : Display help/usage (this) message --version : display rvm package version " } +check_rubyopt_conditions() { + if [[ -n "$RUBYOPT" ]]; then + printf "\n\nWARNING: You have RUBYOPT set in your current environment. This may interfere with normal rvm" + printf "\n operation. If errors show up, please try unsetting RUBYOPT first.\n" + fi +} + spinner_counter=0 spinner() { array=('/' '-' '\\' '|' '/' '-' '\\' '|') index=$((($spinner_counter % 8))) printf "\r${array[$index]}" @@ -280,16 +287,18 @@ printf "\n * 'rvm notes' tells you OS dependency packages for installing rubies." printf "\n * If you encounter any issues with a ruby your best bet is to 'rvm remove X ; rvm install X' " printf "\n * 1.8.7 default patchlevel is p174, override ~/.rvm/config/db in ~/.rvm/config/user" printf "\n * Gemset separator is '@' and will remain unless any rubies error using it." printf "\n$(tput sgr0)\n" + check_rubyopt_conditions 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 [[ -s \$HOME/.rvm/scripts/rvm ]] && source \$HOME/.rvm/scripts/rvm" + printf "\n Please note that this must only occur once - so, you only need to add it the first time you install 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." @@ -307,9 +316,10 @@ printf "\n fi # <= be sure to close the if." printf "\n #EOF .bashrc" printf "\nEven if you use zsh you should still adjust the .bashrc as above." printf "\nIf you have any questions about this please visit #rvm on irc.freenode.net.\n" fi + check_rubyopt_conditions printf "\nInstallation of RVM to $rvm_path/ is complete.\n\n" fi exit 0