rvm-install in rvm-0.0.87

- old
+ new

@@ -24,19 +24,20 @@
 if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 
 # State what is required to use rvm
 echo -e "\n$(tput setaf 2)rvm$(tput sgr0) - shell scripts that allows a user to manage multiple ruby versions in their own account."
-echo -e "\n    Installing to $rvm_path..."
+echo -e "\n    Prepairing $rvm_path ..."
 for dir_name in src scripts bin log archives config gems examples ; do
   mkdir -p "$rvm_path/$dir_name"
 done
 cp -f "$source_dir/README" "$rvm_path/"
 
 #
 # Scripts
 #
+echo -e "\n    Installing rvm to $rvm_path/ ..."
 rm -rf $rvm_path/scripts # Clear the old scripts directory so that the old style rvm- scripts are cleared out.
 for dir_name in config scripts examples lib hooks ; do
   mkdir -p "$rvm_path/$dir_name"
   if [[ -d "$source_dir/$dir_name" ]] ; then
     cp -Rf "$source_dir/$dir_name" "$rvm_path"
@@ -44,49 +45,51 @@
 done ; unset dir_name
 
 #
 # Bin Scripts
 #
-cp -Rf "$source_dir/binscripts/" $rvm_path/bin
+echo -e "\n    Installing bin scripts to $rvm_path/bin ..."
+# Cleanse and purge...
+rm -f $rvm_path/bin/rvm ; rm -rf $rvm_path/bin/binscripts
+for file in rvm-prompt rvm ; do
+  cp -f "$source_dir/binscripts/$file" $rvm_path/bin/
+done
 chmod +x $rvm_path/bin/*
-ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
 
 #
 # RC Files
 #
+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 [[ -z "$(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
-    else
-      : # it exists... remove it and append at the end
     fi
   done
 fi
 
 if [[ "root" = "$(whoami)" ]] ; then
-  ln -nfs $rvm_path/scripts/rvm /usr/local/bin/rvm
-else
-  ln -nfs $rvm_path/scripts/rvm $rvm_path/bin/rvm
+  echo -e "\n    Symlinking rvm to $rvm_symlink_path/rvm ..."
+  ln -nfs $rvm_path/bin/rvm $rvm_symlink_path/rvm
+  chmod +x $rvm_symlink_path/rvm
 fi
-chmod +x $rvm_path/scripts/rvm
 
 #
 # System Checks
 #
 $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)"
 echo -e "\n    ~ Wayne\n"
 
-if [[ -x "$rvm_path/scripts/rvm" ]] ; then
-  "$rvm_path/scripts/rvm" -v
-fi
+if [[ -x "$rvm_path/bin/rvm" ]] ; then "$rvm_path/bin/rvm" -v ; fi
 
 exit 0