rvm-update in wayneeseguin-rvm-0.0.42

- old
+ new

@@ -12,14 +12,20 @@
 source_dir="${source_dir:-`dirname $0 | xargs dirname`}"
 if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 rvm_dir=~/.rvm
 
-echo -e "\nInstalling rvm source to ~/.rvm/scripts/rvm..."
+echo -e "\nInstalling rvm to ~/.rvm/ ..."
 for dir in src scripts bin log archives config gems examples ; do
   mkdir -p $rvm_dir/$dir
 done
+for dir in config scripts examples lib ; do
+  mkdir -p $rvm_dir/$dir
+  /bin/cp -r $source_dir/$dir/ $rvm_dir/$dir
+done
+cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
+chmod +x $rvm_dir/bin/rvm-prompt
 
 # State what is required to use rvm
 echo -e "\n\033[0;32mrvm\033[0m is a shell script that allows a user to manage multiple ruby versions in their own account."
 echo -e "$info In order to use rvm the following line must occur in your shell's loading files:"
 echo -e "\n\033[0;32m    (a)\033[0m if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi"
@@ -114,19 +120,10 @@
 if [ -f ~/.rvm/bin/rvm ] ; then
   echo -e "\n\033[0;32m<i>\033[0m Removing old rvm file from ~/.rvm/bin/rvm"
   rm -f ~/.rvm/bin/rvm
 fi
 
-for dir in config scripts examples ; do
-  mkdir -p $rvm_dir/$dir
-  for file in `/bin/ls $source_dir/$dir/`; do
-    cp $source_dir/$dir/$file $rvm_dir/$dir/$file
-  done
-done
-cp $source_dir/scripts/rvm-prompt $rvm_dir/bin/
-cp $source_dir/VERSION.yml $rvm_dir/
-
 system=`uname`
 if [ "$system" = "Linux" ] ; then
   rvm_apt_get_binary=`which apt-get 2> /dev/null`
   rvm_emerge_binary=`which emerge 2> /dev/null`
   rvm_pacman_binary=`which pacman 2> /dev/null`
@@ -134,10 +131,10 @@
 
   if [ ! -z "$rvm_apt_get_binary" ] ; then
     echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
     echo -e "\033[0;32m <i> \033[0msudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk"
     echo -e "\033[0;33m <w> \033[0mFor ree (if you wish to use it) you will need:"
-    echo -e "\033[0;32m <i> \033[0msudo apt-get install libreadline5-dev libssl-dev "
+    echo -e "\033[0;32m <i> \033[0msudo apt-get install libreadline5-dev libssl-dev bison"
 
   elif [ ! -z "$rvm_emerge_binary" ] ; then
     echo -e "\033[0;33m <w> \033[0mFor jRuby (if you wish to use it) you will need:"
     echo -e "\033[0;32m <i> \033[0msudo emerge dev-java/sun-jdk dev-java/sun-jre-bin"
 