Skip to content

Commit

Permalink
Adjusted install message to be more explicit about the return. Adjust…
Browse files Browse the repository at this point in the history
…ed rbx's installer.
  • Loading branch information
wayneeseguin committed Feb 12, 2010
1 parent d1be6f0 commit df34400
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
5 changes: 4 additions & 1 deletion scripts/install
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,10 @@ if [[ "root" != "$(whoami)" ]] ; then
echo -e "\n1) Place the folowing line at the end of your shell's loading files(.bashrc and then .bash_profile for bash and .zshrc for zsh), after all path/variable settings:"
echo -e "\n if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
echo -e "\n2) Ensure that there is no 'return' from inside the .bashrc file. (otherwise rvm will be prevented from working properly)."
echo -e "\n3) $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
echo -e "\n This means that if you see '[ -z "$PS1" ] && return' then you must split your .bashrc"
echo -e "\n Put everything below and above that line into your .bash_profile, and delete that line and below from .bashrc"
echo -e "\n If you wish to DRY up your config you can 'source ~/.bashrc' at the top of your .bash_profile."
echo -e "\n4) Then $(tput setaf 1)CLOSE THIS SHELL$(tput sgr0) and open a new one in order to use rvm.\n"
fi

exit 0
7 changes: 3 additions & 4 deletions scripts/manage
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,7 @@ RubyWrapper
# __rvm_run "rake.distclean" "\$(rvm 1.8.7 ; rake distclean --trace)" "Running distclean."
#fi

builtin cd "$rvm_ruby_src_path"
chmod +x ./configure
builtin cd "$rvm_ruby_src_path" ; chmod +x ./configure
rvm_ruby_configure="./configure --prefix=$rvm_ruby_home" ; message="Configuring rbx"
if [[ "$rvm_llvm_flag" = "0" ]] ; then
rvm_ruby_configure="$rvm_ruby_configure --disable-llvm"
Expand All @@ -308,9 +307,9 @@ RubyWrapper
fi

if [[ "$rvm_trace_flag" -eq 1 ]] ; then
rvm_ruby_make="rvm 1.8.7 ; rake install --trace" ; message="Compiling rbx (with --trace)"
rvm_ruby_make="$rvm_bin_path/ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level") -S rake install --trace" ; message="Compiling rbx (with --trace)"
else
rvm_ruby_make="rvm 1.8.7 ; rake install" ; message="Compiling rbx"
rvm_ruby_make="$rvm_bin_path/ruby-1.8.7-p$(__rvm_db "ruby_1.8.7_patch_level") -S rake install" ; message="Compiling rbx"
fi
__rvm_run "rake" "$rvm_ruby_make" "$message"
result=$? ; if [[ "$result" -gt 0 ]] ; then
Expand Down

0 comments on commit df34400

Please sign in to comment.