rvm 0.0.21 → 0.0.22

data/bash/rvm

@@ -3,7 +3,7 @@
 rvm_author="Wayne E. Seguin"
 rvm_author_email="wayneeseguin@gmail.com"
 rvm_website="http://rvm.beginrescueend.com/"
-rvm_version="0.0.21"
+rvm_version="0.0.22"
 rvm_updated="2009.08.25"
 
 #
@@ -126,12 +126,12 @@ Usage
 }
 
 # Logging functions based on level
-function rvm-log   { echo -e "\n $* \e[0m" ; }
-function rvm-log-debug { rvm-log "\e[4;34m <d> \e[0m$*" ; }
-function rvm-log-info  { rvm-log "\e[0;32m <i> \e[0m$*" ; }
-function rvm-log-warn  { rvm-log "\e[0;33m <w> \e[0m$*" ; }
-function rvm-log-error { rvm-log "\e[0;31m <e> \e[0m$*" ; }
-function rvm-log-fail  { rvm-log "\e[0;31m <e> \e[0m$*" ; return 1 ; }
+function rvm-log   { echo -e "\n $* \033[0m" ; }
+function rvm-log-debug { rvm-log "\033[4;34m <d> \033[0m$*" ; }
+function rvm-log-info  { rvm-log "\033[0;32m <i> \033[0m$*" ; }
+function rvm-log-warn  { rvm-log "\033[0;33m <w> \033[0m$*" ; }
+function rvm-log-error { rvm-log "\033[0;31m <e> \033[0m$*" ; }
+function rvm-log-fail  { rvm-log "\033[0;31m <e> \033[0m$*" ; return 1 ; }
 
 function rvm-gi { gem install -q --no-rdoc --no-ri $* ; }
 
@@ -477,7 +477,7 @@ function rvm-use {
     done
   fi
 
-  rvm-log-info "Switching to $implementation $version $patchlevel ..."
+  rvm-log-info "Switching to $implementation $version $patchlevel ...\n"
   if [ ! -z "$BASH_VERSION" ] ; then
     exec bash -l
   elif [ ! -z "$ZSH_VERSION" ] ; then

data/bash/rvm-install

@@ -2,22 +2,22 @@
 
 user=`whoami`
 if [ "$user" = "root" ] ; then 
-  echo -e "\e[0;31m <e> \e[0mroot user support is not yet implemented.\e[0m"
+  echo -e "\033[0;31m <e> \033[0mroot user support is not yet implemented.\033[0m"
   exit 1
 fi
 
-info="\n\e[0;32m<i>\e[0m"
-question="\n\e[0;32m<?>\e[0m"
+info="\n\033[0;32m<i>\033[0m"
+question="\n\033[0;32m<?>\033[0m"
 
 echo -e "Installing rvm source to ~/.rvm/bin/rvm..."
 mkdir -p ~/.rvm/src ~/.rvm/bin
 cp $(pwd)/bash/rvm ~/.rvm/bin/
 
 # State what is required to use rvm
-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 "\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 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 -e "\n\033[0;32m    (a)\033[0m if [ -f ~/.rvm/bin/rvm ] ; then source ~/.rvm/bin/rvm ; fi"
+echo -e "\033[0;32m    (b)\033[0m if [ -f ~/.rvm/current ] ; then source ~/.rvm/current ; fi"
 
 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')? "
@@ -78,7 +78,7 @@ if [ "${response:0:1}" = "s" ] ; then
   
   else
   
-    echo -e "\n\e[0;31m<e> An error has occurred, we were expecting either bash or zsh however we encountered $user_shell \e[0m"
+    echo -e "\n\033[0;31m<e> An error has occurred, we were expecting either bash or zsh however we encountered $user_shell \033[0m"
     return 1
   
   fi
@@ -87,13 +87,13 @@ fi
 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
+  if [ ! -z "`which apt-get 2>/dev/null`" ] ; then
     echo -e " sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk  "
-  elif [ ! -z "`which emerge`" ] ; then
+  elif [ ! -z "`which emerge 2>/dev/null`" ] ; then
     echo -e "emerge dev-java/sun-jdk dev-java/sun-jre-bin"
-  elif [ ! -z "`which pacman`" ] ; then
+  elif [ ! -z "`which pacman 2>/dev/null`" ] ; then
     echo -e "pacman -Sy jdk jre"
-  elif [ ! -z "`which yum`" ] ; then
+  elif [ ! -z "`which yum 2>/dev/null`" ] ; 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."
@@ -112,5 +112,5 @@ echo -e "$info Contact wayneeseguin on irc.freenod.net in #rvm for any questions
 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."
+echo -e "$info To start using rvm see: \033[0;32m rvm usage\033[0m, Now close this login shell and open a new one."
 

data/bash/rvm-update

@@ -2,11 +2,11 @@
 
 user=`whoami`
 if [ "$user" = "root" ] ; then 
-  echo -e "\e[0;31m <e> \e[0mroot user support is not yet implemented.\e[0m"
+  echo -e "\033[0;31m <e> \033[0mroot user support is not yet implemented.\033[0m"
   exit 1
 fi
 
-info="\n\e[0;32m<i>\e[0m"
+info="\n\033[0;32m<i>\033[0m"
 
 echo -e "$info Updating rvm source ~/.rvm/bin/rvm ..."
 mkdir -p ~/.rvm/src ~/.rvm/bin

data/rvm.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rvm}
-  s.version = "0.0.21"
+  s.version = "0.0.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wayne E. Seguin"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rvm
 version: !ruby/object:Gem::Version 
-  version: 0.0.21
+  version: 0.0.22
 platform: ruby
 authors: 
 - Wayne E. Seguin