Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Bugfix: Install message no longer shows awk output, notes cleaned up.

  • Loading branch information...
commit ffb9692ba70dc01b46fc5ce3be7f246f15b85df0 1 parent 0a887e6
Wayne E. Seguin authored
Showing with 6 additions and 4 deletions.
  1. +6 −4 scripts/install
10 scripts/install
View
@@ -62,7 +62,9 @@ echo -e "\n Checking rc files ($rvm_rc_files) ..."
if [[ "$rvm_loaded_flag" != "1" ]] ; then
for rcfile in $(echo $rvm_rc_files) ; do
if [[ ! -f $rcfile ]] ; then touch $rcfile ; fi
- if ! awk "/scripts\/rvm/" "$rcfile" ; then
+
+ grep "scripts\/rvm" "$rcfile" > /dev/null 2>&1
+ if [[ $? -gt 0 ]] ; then
echo " Adding 'if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi' to $rcfile."
echo -e "\n# rvm-install added line:\nif [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi\n" >> $rcfile
fi
@@ -80,9 +82,9 @@ fi
#
$rvm_path/scripts/notes
-echo -e " $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings.:"
-echo -e " $item if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
-echo -e " $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
+echo -e " $item In order to use rvm the following line must occur in your shell's loading files, after all path/variable settings:"
+echo -e "\n if [[ -s $rvm_path/scripts/rvm ]] ; then source $rvm_path/scripts/rvm ; fi"
+echo -e "\n $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm."
echo -e "\n$(tput setaf 2)RTFM:\n $(tput sgr0) http://rvm.beginrescueend.com/ \n"
echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)"
Please sign in to comment.
Something went wrong with that request. Please try again.