install in rvm-0.0.57 vs install in rvm-0.0.58

- old
+ new

@@ -1,23 +1,23 @@ #!/bin/bash -user=`whoami` -if [ "$user" = "root" ] ; then - echo -e "\033[0;31m <e> \033[0mroot user support is not yet implemented.\033[0m" +user="$(whoami)" +if [ "root" = "$user" ] ; then + echo -e "$(tput setaf 1) <e> root user support is not yet implemented.$(tput sgr0)" exit 1 fi -item="\033[0;32m* \033[0m" -question="\n\033[0;32m<?>\033[0m" +item="$(tput setaf 2)* $(tput sgr0)" +question="\n$(tput setaf 2)<?>$(tput sgr0)" cwd=$(pwd) -source_dir="${source_dir:-`dirname $0 | xargs dirname`}" +source_dir="${source_dir:-"$(dirname $0 | xargs dirname)"}" if [ ! -d "$source_dir" ] ; then unset source_dir ; fi source_dir="${source_dir:-$cwd}" rvm_path=~/.rvm # State what is required to use rvm -echo -e "\n\033[0;32mrvm\033[0m\n\n shell scripts that allows a user to manage multiple ruby versions in their own account." +echo -e "\n$(tput setaf 2)rvm$(tput sgr0)\n\n shell scripts that allows a user to manage multiple ruby versions in their own account." echo -e "\n Installing rvm to ~/.rvm/ ..." for dir_name in src scripts bin log archives config gems examples ; do mkdir -p $rvm_path/$dir_name done @@ -44,11 +44,11 @@ echo -e "\n Ensuring that rvm script location in $file is scripts/rvm not bin/rvm for: ~/.bash_profile, ~/.bashrc, ~/.zshrc..." for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do if [ -s $file ] ; then if [ -L $file ] ; then # If the file is a symlink, - actual_file=`readlink $file` # read the link target so we can preserve it. + actual_file="$(readlink $file)" # read the link target so we can preserve it. else actual_file="$file" fi grep 'rvm\/bin\/rvm' $actual_file > /dev/null @@ -71,50 +71,50 @@ if [ -f ~/.rvm/bin/rvm ] ; then echo -e "\n Removing old rvm file from ~/.rvm/bin/rvm..." rm -f ~/.rvm/bin/rvm fi -system=`uname` -echo -e "\n \033[0;33mNOTES: \033[0m" -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` - rvm_yum_binary=`which yum 2> /dev/null` +system="$(uname)" +echo -e "\n $(tput setaf 3)NOTES: $(tput sgr0)\n" +if [ "Linux" = "$system" ] ; 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)" + rvm_yum_binary="$(which yum 2> /dev/null)" if [ ! -z "$rvm_apt_get_binary" ] ; then - echo -e " $item For jRuby (if you wish to use it) you will need:" - echo -e " $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk" - echo -e " $item For ree (if you wish to use it) you will need:" - echo -e " $ sudo apt-get install libreadline5-dev libssl-dev bison" + echo -e " $item For jRuby (if you wish to use it) you will need:" + echo -e " $ sudo apt-get install sun-java6-bin sun-java6-jre sun-java6-jdk" + echo -e " $item For ree (if you wish to use it) you will need:" + echo -e " $ sudo apt-get install libreadline5-dev libssl-dev bison" elif [ ! -z "$rvm_emerge_binary" ] ; then - echo -e " $item For jRuby (if you wish to use it) you will need:" - echo -e " $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin" + echo -e " $item For jRuby (if you wish to use it) you will need:" + echo -e " $ sudo emerge dev-java/sun-jdk dev-java/sun-jre-bin" elif [ ! -z "$rvm_pacman_binary" ] ; then - echo -e " $item For jRuby (if you wish to use it) you will need:" - echo -e " $ sudo pacman -Sy jdk jre" + echo -e " $item For jRuby (if you wish to use it) you will need:" + echo -e " $ sudo pacman -Sy jdk jre" elif [ ! -z "$rvm_yum_binary" ] ; then - echo -e " $item For ree (if you wish to use it) you will need:" - echo -e " $ yum install -y rpm-build gcc gcc-c++ redhat-rpm-config ; then download and rpmbuild and install the sdk, Have fun..." + echo -e " $item For ree (if you wish to use it) you will need:" + 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 " $item For jRuby (if you wish to use it) you will need:" - echo -e " The SUN java runtime environment and development kit." + echo -e " $item For jRuby (if you wish to use it) you will need:" + echo -e " The SUN java runtime environment and development kit." fi -elif [ "$system" = "Darwin" ] ; then - echo -e " $item Be sure that you have XCode Tools installed in order to use rvm." - echo -e " $item If you intend on installing MacRuby you must install LLVM first." +elif [ "Darwin" = "$system" ] ; then + echo -e " $item Be sure that you have XCode Tools installed in order to use rvm." + echo -e " $item If you intend on installing MacRuby you must install LLVM first." fi 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/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi" echo -e " $item CLOSE THIS SHELL AND OPEN A NEW ONE in order to use rvm." -echo -e "\n \033[0;33mRTFM: \033[0m http://rvm.beginrescueend.com/ \n" -echo -e '\033[0;32mw⦿‿⦿t!\033[0m' +echo -e "\n \033[0;33mRTFM: $(tput sgr0) http://rvm.beginrescueend.com/ \n" +echo -e "$(tput setaf 2)w⦿‿⦿t!$(tput sgr0)" echo -e "\n ~ Wayne\n" source $rvm_path/scripts/rvm rvm -v echo