rvm-install in rvm-0.0.16

- old
+ new

@@ -17,44 +17,42 @@
 echo -e "\n\e[0;32mrvm\e[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 two items must occur in your shell's load paths:"
 echo -e "\n\e[0;32m    (a)\e[0m if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi"
 echo -e "\e[0;32m    (b)\e[0m if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi"
 
-echo -n -e "$question Would you like (u)s to set this up for you, or do it (y)ourself (u/y)? "
 while : ; do
+  echo -n -e "$question Do you want this (s)cript to set this up for you, or do it (m)anually yourself ('s' or 'm')? "
   read response
-  if [ "${response:0:1}" = "u" ] ; then
+  if [ "${response:0:1}" = "s" ] ; then
     echo 'w00t!'
     break
-  elif [ "${response:0:1}" = "f" ] ; then
+  elif [ "${response:0:1}" = "m" ] ; then
     echo -e "$info Please make sure that both lines (a) and (b) are in place, with (a) sourced *first*."
     break
-  else
-    echo -n -e "$question Would you like (u)s to set this up for you, or do it yoursel(f) (u/f)? "
   fi
 done
 
-if [ "${response:0:1}" = "u" ] ; then
+if [ "${response:0:1}" = "s" ] ; then
 
-  # Find out the user's shell bash / zsh
-  echo -n -e "$question Do you use (b)ash or (z)sh for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(b/z) ? "
   while : ; do
+    echo -n -e "$question Do you use b(a)sh or (z)sh or b(o)th for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(a/z/o)? "
     read response
-    if [ "${response:0:1}" = "b" ] ; then
+    if [ "${response:0:1}" = "a" ] ; then
       user_shell="bash"
       break
     elif [ "${response:0:1}" = "z" ] ; then
       user_shell="zsh"
       break
-    else
-      echo -n -e "$question Do you use (b)ash or (z)sh for your shell (the default on most *nix systems is bash, press control + C to cancel the installation)\n(b/z) ? "
+    elif [ "${response:0:1}" = "o" ] ; then
+      user_shell="both"
+      break
     fi
   done
   
   touch ~/.profile
   
-  if [ "$user_shell" = "bash" ] ; then
+  if [ "$user_shell" = "bash" -o "$user_shell" = "both" ] ; then
   
     touch ~/.bash_profile
     if [ -z "`grep '\.rvm/bin/rvm' ~/.bash_profile`" ] ; then
       echo "Adding 'if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi' to your ~/.bash_profile."
       echo "if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi" >> ~/.bash_profile
@@ -63,11 +61,11 @@
     if [ -z "`grep '\.rvm/current' ~/.bash_profile`" ] ; then
       echo "Adding 'if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi' ~/.bash_profile."
       echo "if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi" >> ~/.bash_profile
     fi
   
-  elif [ "$user_shell" = "zsh" ] ; then
+  elif [ "$user_shell" = "zsh" -o "$user_shell" = "both" ] ; then
   
     touch ~/.zshrc
     if [ -z "`grep '\.rvm/bin/rvm' ~/.zshrc`" ] ; then
       echo "Adding 'if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi' to your ~/.zshrc."
       echo "if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi" >> ~/.zshrc
@@ -84,13 +82,32 @@
     return 1
   
   fi
 fi
 
-echo -e "\n$info If you add ~/.rvm/bin/ to your path you will be able to rever to installed ruby binaries using: <implementation>-<version>p<patchlevel>"
+system=`uname`
+if [ "$system" = "Linux" ] ; then
+  echo -e "For jRuby (if you wish to use it) you will need:"
+  if [ ! -z "`which apt-get`" ] ; then
+    echo -e " sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk  "
+  elif [ ! -z "`which emerge`" ] ; then
+    echo -e "emerge dev-java/sun-jdk dev-java/sun-jre-bin"
+  elif [ ! -z "`which pacman`" ] ; then
+    echo -e "pacman -Sy jdk jre"
+  elif [ ! -z "`which yum`" ] ; then
+    echo -e "yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..."
+  else
+    echo -e "The SUN java runtime environment and development kit."
+  fi
+#elif [ "$sytem" = "Darwin" ] ; then
+#else
+
+fi
+
+echo -e "\n$info If you add ~/.rvm/bin/ to your path you will be able to refer to installed ruby binaries using: <implementation>-<version>p<patchlevel>"
 echo -e "     For example: ~/.ruby-1.9.1p243 -e 'puts \"hello world\"' #=> hello world"
 echo -e "$info Contact wayneeseguin on irc.freenod.net in #rvm for any questions / feedback."
-echo -e "     I truely hope that you find rvm helpful! Thank you very much for using rvm. \n"
+echo -e "     I truly hope that you find rvm helpful! Thank you very much for using rvm. \n"
 echo -e "       ~ Wayne"
 
 echo -e "$info To start using rvm see: \e[0;32m rvm usage\e[0m, Now close this login shell and open a new one."
 