rvm 0.0.61 → 0.0.62

data/scripts/completion

@@ -6,8 +6,8 @@ _rvm ()
 {
 	local i c=1 command __git_dir
 
-	while [ $c -lt $COMP_CWORD ]; do
-		i="${COMP_WORDS[c]}"
+	while [[ $c -lt $COMP_CWORD ]]; do
+		i="${COMP_WORDS[[c]]}"
 		case "$i" in
 		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
 		--bare)      __git_dir="." ;;
@@ -18,8 +18,8 @@ _rvm ()
 		c=$((++c))
 	done
 
-	if [ -z "$command" ]; then
-		case "${COMP_WORDS[COMP_CWORD]}" in
+	if [[ -z "$command" ]]; then
+		case "${COMP_WORDS[[COMP_CWORD]]}" in
 		--*)   __gitcomp "
 			--paginate
 			--no-pager
@@ -38,7 +38,7 @@ _rvm ()
 	fi
 
 	local expansion=$(__git_aliased_command "$command")
-	[ "$expansion" ] && command="$expansion"
+	[[ "$expansion" ]] && command="$expansion"
 
 	case "$command" in
       install|uninstall|path|info|setup|version|srcdir|list|reset|debug|reload|usage|help|implode|update|readline|iconv|benchmark|bench|use|gemsync)
@@ -110,8 +110,8 @@ _rvm ()
 # generates completion reply with compgen
 function __rvm_completion_reply
 {
-	local cur="${COMP_WORDS[COMP_CWORD]}"
-	if [ $# -gt 2 ]; then
+	local cur="${COMP_WORDS[[COMP_CWORD]]}"
+	if [[ $# -gt 2 ]]; then
 		cur="$3"
 	fi
 	case "$cur" in
@@ -173,7 +173,7 @@ function _rvm {
     info|debug)
       __rvm_version
       __rvm_info
-      if [ "debug" = "$rvm_action" ] ; then __rvm_debug ; fi
+      if [[ "debug" = "$rvm_action" ]] ; then __rvm_debug ; fi
       result=0
     ;;
 
@@ -183,7 +183,7 @@ function _rvm {
       result=1;
     ;;
     *)
-      if [ ! -z "$rvm_action" ] ; then
+      if [[ ! -z "$rvm_action" ]] ; then
         __rvm_log "fail"  "unknown action '$rvm_action'"
       else
         __rvm_usage

data/scripts/gems

@@ -2,52 +2,52 @@
 
 __rvm_gems() {
   unset GEM_PATH
-  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
 
-  if [ ! -z "$rvm_clear_flag" ] ; then
+  if [[ ! -z "$rvm_clear_flag" ]] ; then
     __rvm_gems_clear
-  elif [ ! -z "$rvm_load_flag" ] ; then
+  elif [[ ! -z "$rvm_load_flag" ]] ; then
     __rvm_gems_load
-  elif [ ! -z "$rvm_dump_flag" ] ; then
+  elif [[ ! -z "$rvm_dump_flag" ]] ; then
     __rvm_gems_dump
-  elif [ ! -z "$rvm_delete_flag" ] ; then
+  elif [[ ! -z "$rvm_delete_flag" ]] ; then
     __rvm_gems_delete
-  elif [ ! -z "$rvm_name_flag" ] ; then
+  elif [[ ! -z "$rvm_name_flag" ]] ; then
     __rvm_gems_name
-  elif [ ! -z "$rvm_dir_flag" ] ; then
+  elif [[ ! -z "$rvm_dir_flag" ]] ; then
     __rvm_gems_dir
-  elif [ ! -z "$rvm_list_flag" ] ; then
+  elif [[ ! -z "$rvm_list_flag" ]] ; then
     __rvm_gems_list
-  #elif [ ! -z "$rvm_use_flag" ] ; then
+  #elif [[ ! -z "$rvm_use_flag" ]] ; then
   else
     __rvm_gems_use
   fi
 }
 
 __rvm_gems_select() {
-  if [ -z "$rvm_gem_set_name" ] ; then
-    if [ ! -z "$GEM_HOME" ] ; then
+  if [[ -z "$rvm_gem_set_name" ]] ; then
+    if [[ ! -z "$GEM_HOME" ]] ; then
       rvm_gem_set_name=$(echo $GEM_HOME | xargs basename | awk -F'%' '{print $2}')
     fi
 
-    if [ ! -z "$rvm_ruby_gem_home" ] ; then
+    if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
       rvm_gem_set_name=$(echo $rvm_ruby_gem_home | xargs basename | awk -F'%' '{print $2}')
     fi
 
     if [[ ! -z "$rvm_gem_set_name" ]] && [[ ! "$rvm_gem_set_name" =~ ^\d\.\d ]] ; then
       rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
     else
-      if [ ! -z "$rvm_ruby_interpreter" -a ! -z "$rvm_ruby_version" -a "$rvm_ruby_interpreter" != "system" ] ; then
+      if [[ ! -z "$rvm_ruby_interpreter" ]] && [[ ! -z "$rvm_ruby_version" ]] && [[ "$rvm_ruby_interpreter" != "system" ]] ; then
         rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version"
-      elif [ -z "$GEM_HOME" ] ; then
+      elif [[ -z "$GEM_HOME" ]] ; then
         rvm_ruby_gem_home=$(gem env gemdir)
-      elif [ ! -z "$GEM_HOME" ] ; then
+      elif [[ ! -z "$GEM_HOME" ]] ; then
         rvm_ruby_gem_home="$GEM_HOME"
       else
         __rvm_log "error" "Cannot select gem home, something definitely wrong :/"
       fi
     fi
-    if [ -z "$rvm_gem_set_name" ] ; then unset rvm_gem_set_name ; fi
+    if [[ -z "$rvm_gem_set_name" ]] ; then unset rvm_gem_set_name ; fi
   else
     rvm_ruby_gem_home="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
   fi
@@ -80,16 +80,16 @@ __rvm_gems_clear() {
   __rvm_gems_use
 }
 
-__rvm_gems_delete () {
-  if [ ! -z "$rvm_gem_set_name" ] ; then
+__rvm_gems_delete() {
+  if [[ ! -z "$rvm_gem_set_name" ]] ; then
     gemdir="$rvm_gem_path/$rvm_ruby_interpreter/$rvm_ruby_version%$rvm_gem_set_name"
-    if [ -d "$gemdir" -a ! -z "$rvm_force_flag" ] ; then
+    if [[ -d "$gemdir" ]] && [[ ! -z "$rvm_force_flag" ]] ; then
         rm -rf  "$gemdir"
-    elif [ -d "$gemdir" ] ; then
+    elif [[ -d "$gemdir" ]] ; then
       __rvm_log "warn" "Are you SURE you wish to remove the installed gems '$rvm_gem_set_name ' ($gemdir)?"
       echo -n "(anything other than 'yes' will cancel) > "
       read response
-      if [ "yes" = "$response" ] ; then
+      if [[ "yes" = "$response" ]] ; then
         rm -rf  "$gemdir"
       else
         __rvm_log "info" "Not doing anything, phew... close call that one eh?"
@@ -103,13 +103,13 @@ __rvm_gems_delete () {
 }
 
 __rvm_gems_dump() {
-  if [ ! -z "$rvm_ruby_gem_home" ] ; then
+  if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME ;
     GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH ;
   fi
 
-  if [ -z "$rvm_file_name" ] ; then
-    if [ ! -z "$rvm_gem_set_name" ] ; then
+  if [[ -z "$rvm_file_name" ]] ; then
+    if [[ ! -z "$rvm_gem_set_name" ]] ; then
       rvm_file_name="$rvm_gem_set_name.gems"
     else
       rvm_file_name="default.gems"
@@ -121,7 +121,7 @@ __rvm_gems_dump() {
 
   for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | tr ' ' ';') ; do
     name="$(echo $gem | awk -F';' '{print $1}')"
-    if [ -z "$rvm_latest_flag" ] ; then
+    if [[ -z "$rvm_latest_flag" ]] ; then
       versions="$(echo $gem | awk -F';' '{print $2}' | sed 's#,# #g')"
       for version in $versions ; do
         echo "$name -v$version" >> $rvm_file_name
@@ -133,69 +133,69 @@ __rvm_gems_dump() {
 }
 
 __rvm_gems_load() {
-  if [ ! -z "$rvm_ruby_gem_home" ] ; then
+  if [[ ! -z "$rvm_ruby_gem_home" ]] ; then
     GEM_HOME="$rvm_ruby_gem_home" ; export GEM_HOME ;
     GEM_PATH="$rvm_ruby_gem_home" ; export GEM_PATH ;
   fi
 
-  if [ -z "$rvm_file_name" ] ; then
-    if [ -f "$rvm_gem_set_name.gems" ] ; then
+  if [[ -z "$rvm_file_name" ]] ; then
+    if [[ -f "$rvm_gem_set_name.gems" ]] ; then
       rvm_file_name="$rvm_gem_set_name.gems"
-    elif [ -f "default.gems" ] ; then
+    elif [[ -f "default.gems" ]] ; then
       rvm_file_name="default.gems"
-    elif [ -f "system.gems" ] ; then
+    elif [[ -f "system.gems" ]] ; then
       rvm_file_name="system.gems"
     fi
   fi
 
-  if [ -f "$rvm_file_name" ] ; then
+  if [[ -f "$rvm_file_name" ]] ; then
     echo "Loading $rvm_file_name file..."
-    rvm_ruby_gem_list=$(/bin/ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#\.gemspec$##' 2> /dev/null)
+    rvm_ruby_gem_list=$(/bin/ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
     while read line
     do # Keep this on 2nd line :( bash fail.
       # TODO: Switch to a different field separator than ; to allow for evals
       gem="$(echo $line | awk -F';' '{print $1}')"
+      gem_prefix="$(echo $line | awk -F';' '{print $2}')"
       if [[ ! -z "$gem" ]] && [[ "$gem" =~ \.gem$ ]] ; then
-        gem_prefix="$(echo $line | awk -F';' '{print $2}')"
-        gem_name="$(echo $gem | awk '{print $1}')"
-        gem_version="$(echo $gem | awk '{print $2}' | sed 's#^.*-v[=]*[ ]*##' )"
-        gem_postfix="$(echo $gem | sed "s/$gem_name//" | sed "s#-v[=]*[ ]*$gem_version##")"
+        gem_name="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{$NF=NULL;print}')"
+        gem_version="$(basename $gem | sed 's#\.gem##' | awk -F'-' '{print $NF}' )"
+        gem_postfix="$(basename $gem | sed "s#.*\.gem##")"
       else
-        gem_prefix="$(echo $line | awk -F';' '{print $2}')"
         gem_name="$(echo $gem | awk '{print $1}')"
-        gem_version="$(echo $gem | awk '{print $2}' | sed 's#^.*-v[=]*[ ]*##' )"
-        gem_postfix="$(echo $gem | sed "s/$gem_name//" | sed "s#-v[=]*[ ]*$gem_version##")"
+        gem_version="$(echo $gem | awk '{print $2}' | sed 's#.*-v[=]*[ ]*##' )"
+        gem_postfix="$(echo $gem | sed "s#${gem_name/ /}##" | sed "s#-v[=]*[ ]*${gem_version/ /}##")"
       fi
 
-      if [ -f "$gem" ] ; then
-        gem_file_name="$(basename $gem)"
+      if [[ -f "$gem" ]] ; then
+        gem_file_name="$gem"
+        cache_file="$gem"
       elif [[ ! -z "$gem" ]] && [[ "$gem" =~ ".gem$" ]] ; then
-        gem_file_name="${gem}"
-      elif [ -z "$gem_version" ] ; then # no version
-        gem_file_name="${gem_name}*.gem"
+        gem_file_name="$gem"
+      elif [[ -z "${gem_version/ /}" ]] ; then # no version
+        gem_file_name="${gem_name/ /}*.gem"
       else # version
-        gem_file_name="$gem_name-$gem_version.gem"
+        gem_file_name="${gem_name/ /}-${gem_version/ /}.gem"
       fi
 
-      if [ -z "$rvm_force_flag" -a -f "$rvm_ruby_gem_home/specifications/${gem_file_name/\.gem/.gemspec}" ] ; then
+      if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/${gem_name/ /}-${gem_version/ /}.gemspec" ]] ; then
         unset gem
-        __rvm_log "warn" "Skipping $(__color "yellow")$gem_name $gem_version$(__color "none") (--force to re-install)"
+        __rvm_log "warn" "$(__color "yellow")$gem_name $gem_version$(__color "none") exists, skipping (--force to re-install)"
       else
-        cache_file=$(/bin/ls -t "$rvm_gem_path/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)
-        if [ -z "$cache_file" ] ; then
-          if [ -f "$gem_file_name" ] ; then
+        cache_file="${cache_file:-$(/bin/ls -t "${rvm_gem_path}/*/*/cache/${gem_file_name}*" 2> /dev/null | head -n1)}"
+        if [[ -z "$cache_file" ]] ; then
+          if [[ -f "$gem_file_name" ]] ; then
             gem="$gem_file_name"
-          elif [ -z "$gem_version" ] ; then
-            gem="$gem_name"
+          elif [[ -z "${gem_version/ /}" ]] ; then
+            gem="${gem_name/ /}"
           else
-            gem="$gem_name -v $gem_version"
+            gem="${gem_name/ /} -v $gem_version"
           fi
         else # cached
-          gem_file_name="$(basename $cache_file)"
+          gem_file_name="$(basename "$cache_file")"
           gem_string="$(echo "$gem_file_name" | sed 's#\.gem$##')"
-          if [ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/$gem_string/{print}")" ] ; then
+          if [[ ! -z "$(echo "$rvm_ruby_gem_list" | awk "/${gem_name/ /} \(.*$gem_version/{print}")" ]] ; then
             #if [[ ! -z "$rvm_ruby_gem_list" ]] && [[ "$rvm_ruby_gem_list" =~ $gem_string ]] ; then
-            if [ ! -z "$rvm_force_flag" ] ; then
+            if [[ ! -z "$rvm_force_flag" ]] ; then
               cp $cache_file $rvm_temp_path/$gem_file_name
               gem="$rvm_temp_path/$gem_file_name" # install as a named local gem
             fi
@@ -205,7 +205,7 @@ __rvm_gems_load() {
         fi
       fi
 
-      if [ ! -z "$gem" ] ; then
+      if [[ ! -z "$gem" ]] ; then
         # TODO: Set vars if fourth field is non-empty (means that there are conditional statements to execute in the gem install line.
         __rvm_make_flags
         __rvm_log "info" "Installing $gem_name $gem_version..."

data/scripts/install

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 user="$(whoami)"
-if [ "root" = "$user" ] ; then
+if [[ "root" = "$user" ]] ; then
   echo -e "$(tput setaf 1) <e> root user support is not yet implemented.$(tput sgr0)"
   exit 1
 fi
@@ -10,7 +10,7 @@ item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
 cwd=$(pwd)
 source_dir="${source_dir:-"$(dirname $0 | xargs dirname)"}"
-if [ ! -d "$source_dir" ] ; then unset source_dir ; fi
+if [[ ! -d "$source_dir" ]] ; then unset source_dir ; fi
 source_dir="${source_dir:-$cwd}"
 rvm_path=~/.rvm
 
@@ -32,34 +32,34 @@ for file_name in rvm-prompt gemsync ; do
   chmod +x $rvm_path/bin/$file_name
 done ; unset file_name
 
-if [ -z "$rvm_loaded_flag" ] ; then
+if [[ -z "$rvm_loaded_flag" ]] ; then
   for rcfile in .bash_profile .bashrc .zshrc ; do
-    if [ ! -e ~/$rcfile ] ; then touch ~/$rcfile ; fi
-    if [ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ] ; then
-      echo "Adding 'if [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
-      echo -e "\n# rvm-install added line:\nif [ -s ~/.rvm/scripts/rvm ] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
+    if [[ ! -e ~/$rcfile ]] ; then touch ~/$rcfile ; fi
+    if [[ -z "$(awk '/\.rvm\/scripts\/rvm/' ~/$rcfile)" ]] ; then
+      echo "Adding 'if [[ -s ~/.rvm/scripts/rvm ]] ; then source ~/.rvm/scripts/rvm ; fi' to your ~/$rcfile."
+      echo -e "\n# rvm-install added line:\nif [[ -s ~/.rvm/scripts/rvm ]] ; then source ~/.rvm/scripts/rvm ; fi\n" >> ~/$rcfile
     fi
   done
 fi
 
 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,
+  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.
     else
       actual_file="$file"
     fi
 
     grep 'rvm\/bin\/rvm' $actual_file > /dev/null
-    if [ $? -eq 0 ] ; then
+    if [[ $? -eq 0 ]] ; then
       sed -i.orig 's#rvm/bin/rvm #rvm/scripts/rvm #g' $actual_file
       rm -f $actual_file.orig
     fi
 
-    if [ -f ~/.profile ] ; then
+    if [[ -f ~/.profile ]] ; then
       grep '.profile' $actual_file > /dev/null
-      if [ $? -gt 0 ] ; then
+      if [[ $? -gt 0 ]] ; then
         profile=~/.profile
         echo -e "\n" >> $actual_file
         echo "source $profile" >> $actual_file
@@ -68,34 +68,34 @@ for file in ~/.bash_profile ~/.bashrc ~/.zshrc ; do
   fi
 done
 
-if [ -f ~/.rvm/bin/rvm ] ; then
+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    $(tput setaf 3)NOTES: $(tput sgr0)\n"
-if [ "Linux" = "$system" ] ; then
+if [[ "Linux" = "$system" ]] ; then
   rvm_apt_get_binary="$(which aptitude 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
+  if [[ ! -z "$rvm_apt_get_binary" ]] ; then
     echo -e "    $item For jRuby (if you wish to use it) you will need:"
     echo -e "       $ sudo aptitude 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 aptitude install libreadline5-dev libssl-dev bison"
 
-  elif [ ! -z "$rvm_emerge_binary" ] ; then
+  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"
 
-  elif [ ! -z "$rvm_pacman_binary" ] ; then
+  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"
 
-  elif [ ! -z "$rvm_yum_binary" ] ; then
+  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..."
 
@@ -103,13 +103,13 @@ if [ "Linux" = "$system" ] ; then
     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 [ "Darwin" = "$system"  ] ; then
+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 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: $(tput sgr0) http://rvm.beginrescueend.com/ \n"

data/scripts/ruby-installer

@@ -1,50 +1,50 @@
 #!/bin/bash
 
 function __rvm_install_source {
-  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
   __rvm_log "info" "Installing Ruby from source to: $rvm_ruby_home"
   mkdir -p "$rvm_ruby_log_path"
 
   __rvm_pushpop "$rvm_src_path"
 
-  if [ ! -z "$rvm_force_flag" ] ; then
+  if [[ ! -z "$rvm_force_flag" ]] ; then
     rm -rf "$rvm_ruby_home" "$rvm_ruby_src_path"
   fi
 
   result=0
-  if [ -z "$rvm_ruby_tag" -a -z "$rvm_ruby_revision" ] ; then
-    if [ ! -f "$rvm_archives_path/$rvm_ruby_package_name.tar.gz" ]  ; then
+  if [[ -z "$rvm_ruby_tag" ]] && [[ -z "$rvm_ruby_revision" ]] ; then
+    if [[ ! -f "$rvm_archives_path/$rvm_ruby_package_name.tar.gz" ]] ; then
       rvm_url="${rvm_url:-"ftp://ftp.ruby-lang.org/pub/ruby/1.$rvm_major_version/$rvm_ruby_package_name.tar.gz"}"
       __rvm_log "info" "Downloading $rvm_ruby_package_name, this may take a while depending on your connection..."
       __rvm_fetch "$rvm_url"
-      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
     fi
     #mkdir -p "$rvm_ruby_src_path" # Is this line necessary considering -C below?    v
     __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_name.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_name ..."
-    if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+    if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
   else
     __rvm_log "info" "Retrieving Ruby from $rvm_url"
-    if [ ! -z "$(echo $rvm_url | awk '/^git/')" ] ; then
-      if [ -d "$rvm_ruby_src_path/.git" ] ; then
+    if [[ ! -z "$(echo $rvm_url | awk '/^git/')" ]] ; then
+      if [[ -d "$rvm_ruby_src_path/.git" ]] ; then
         cd $rvm_ruby_src_path
-        if [ -z "$rvm_ruby_revision" ] ; then
+        if [[ -z "$rvm_ruby_revision" ]] ; then
           git pull origin master
-          if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
         else
           git checkout ${rvm_ruby_revision:-HEAD}
-          if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
         fi
       else
         git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path
-        if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+        if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
       fi
     else
-      if [ -z "$rvm_ruby_revision" ] ; then
+      if [[ -z "$rvm_ruby_revision" ]] ; then
         # TODO: Check if tag v is valid
         rvm_url="$rvm_ruby_repo_url/tags/$rvm_ruby_tag"
         rvm_rev=""
       else
-        if [ "head" = "$rvm_ruby_revision" -o  "trunk" = "$rvm_ruby_revision" ] ; then
+        if [[ "head" = "$rvm_ruby_revision" ]] || [[  "trunk" = "$rvm_ruby_revision" ]] ; then
           rvm_url="$rvm_ruby_repo_url/trunk"
           rvm_rev=""
         else
@@ -53,9 +53,9 @@ function __rvm_install_source {
         fi
       fi
 
-      if [ -d "$rvm_ruby_src_path/.svn" ] ; then
+      if [[ -d "$rvm_ruby_src_path/.svn" ]] ; then
         cd $rvm_ruby_src_path
-        if [ -z "$rvm_rev" ] ; then
+        if [[ -z "$rvm_rev" ]] ; then
           svn update
         else
           svn checkout -q $rvm_rev
@@ -63,27 +63,27 @@ function __rvm_install_source {
       else
         svn checkout -q $rvm_rev --force $rvm_url $rvm_ruby_src_path
       fi
-      if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+      if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
     fi
   fi
 
   cd $rvm_ruby_src_path
-  if [ $? -gt 0 ] ; then result=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
+  if [[ $? -gt 0 ]] ; then result=$? ; __rvm_log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log" ; __rvm_pushpop ; return $result ; fi
 
-  if [ ! -s "$rvm_ruby_src_path/configure" ] ; then
+  if [[ ! -s "$rvm_ruby_src_path/configure" ]] ; then
     rvm_autoconf="$(which autoconf)"
-    if [ $? -gt 0 ] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
+    if [[ $? -gt 0 ]] ; then __rvm_log "fail" "rvm expects autoconf" ; result=$? ; return $result ; fi
     __rvm_run "autoconf" "$rvm_autoconf" "Running autoconf"
-    # if [ $? -gt 0 ] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
+    # if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi # Don't barf on autoconf fail...
   fi
 
-  if [ -s ./Makefile -a -z "$rvm_reconfigure_flag" ] ; then
+  if [[ -s ./Makefile ]] && [[ -z "$rvm_reconfigure_flag" ]] ; then
     __rvm_log "debug" "Skipping configure step, Makefile exists so configure must have already been run."
-  elif [ -s ./configure ] ; then
+  elif [[ -s ./configure ]] ; then
     __rvm_run "configure" "./configure --prefix=$rvm_ruby_home $rvm_ruby_configure $configure_parameters" "Configuring $rvm_ruby_package_name using $rvm_ruby_configure, this may take a while depending on your cpu(s)..."
-    if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+    if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
     unset configure_parameters
-  elif [ ! -z "rvm_ruby_configure" ] ; then
+  elif [[ ! -z "rvm_ruby_configure" ]] ; then
     $rvm_ruby_configure
   else
     __rvm_log "error" "Skipping configure step, 'configure' script does not exist, did autoconf not run successfully?"
@@ -91,11 +91,11 @@ function __rvm_install_source {
 
   rvm_ruby_make=${rvm_ruby_make:-"/usr/bin/make"}
   __rvm_run "make" "$rvm_ruby_make $rvm_make_flags" "Compiling $rvm_ruby_package_name, this may take a while, depending on your cpu(s)..."
-  if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+  if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
   rvm_ruby_make_install=${rvm_ruby_make_install:-"/usr/bin/make install"}
   __rvm_run "install" "$rvm_ruby_make_install" "Installing $rvm_ruby_package_name"
-  if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+  if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
 
   __rvm_log "info" "Installation of $rvm_ruby_package_name is complete."
 
@@ -111,13 +111,13 @@ function __rvm_install_source {
 
 function __rvm_install_ruby {
 
-  if [ -z "$rvm_ruby_selected_flag" ]   ; then __rvm_select $* ; fi
-  if [ ! -z "$RUBYOPT" ]      ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
+  if [[ -z "$rvm_ruby_selected_flag" ]]  ; then __rvm_select $* ; fi
+  if [[ ! -z "$RUBYOPT" ]]     ; then ruby_options="$RUBYOPT" ; unset RUBYOPT ; fi
   __rvm_make_flags
 
   case "$rvm_ruby_interpreter" in
     macruby)
-      if [ "$(uname)" = "Darwin" ] ; then
+      if [[ "$(uname)" = "Darwin" ]] ; then
         rvm_url="$(__rvm_db "macruby_nightly_url")"
         __rvm_log "info" "Retrieving latest macruby" # $rvm_archives_path/macruby_nightly.pkg
         __rvm_fetch $rvm_url
@@ -130,28 +130,29 @@ function __rvm_install_ruby {
     ;;
 
     ree)
-      if [ ! -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" -a -z "$rvm_head_flag" ] ; then
+      __rvm_make_flags
+      if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.8/')" ]] && [[ -z "$rvm_head_flag" ]] ; then
         rvm_url="$(__rvm_db "ree_${rvm_ruby_version}_url")/$rvm_ruby_package_file.tar.gz"
         __rvm_log "info" "Installing Ruby Enterprise Edition from source to: $rvm_ruby_home"
         __rvm_pushpop "$rvm_src_path"
-        if [ -z "$rvm_force_flag" -a -d "$rvm_ruby_src_path" -a ! -x "$rvm_ruby_src_path/installer" ]  ; then
+        if [[ -z "$rvm_force_flag" ]] && [[ -d "$rvm_ruby_src_path" ]] && [[ ! -x "$rvm_ruby_src_path/installer" ]] ; then
           __rvm_log "It appears that the archive has already been extracted. Skipping extract (use --force to force re-download and extract)."
         else
           __rvm_log "Downloading $rvm_ruby_package_file, this may take a while depending on your connection..."
           __rvm_fetch "$rvm_url"
-          if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
           rm -rf "$rvm_ruby_src_path"
           __rvm_run "extract" "tar xzf $rvm_archives_path/$rvm_ruby_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_ruby_package_file..."
-          if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+          if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
           mv "$rvm_src_path/$rvm_ruby_package_file" "$rvm_ruby_src_path"
         fi
         cd "$rvm_ruby_src_path"
 
         mkdir -p "$rvm_ruby_log_path"
         mkdir -p "${rvm_ruby_home}/lib/ruby/gems/1.8/gems"
-        if [ ! -z "$rvm_ruby_configure" ] ; then rvm_ruby_configure="-c $rvm_ruby_configure"; fi
-        __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level --dont-install-useful-gems $rvm_ruby_configure" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..." # --no-tcmalloc
-        if [ $? -gt 0 ] ; then result=$? ; return $result ; fi
+        if [[ ! -z "$rvm_ruby_configure" ]] ; then rvm_ruby_configure="-c $rvm_ruby_configure"; fi
+        __rvm_run "install" "./installer -a $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version-$rvm_ruby_patch_level $rvm_ree_options --dont-install-useful-gems $rvm_ruby_configure" "Installing $rvm_ruby_string, this may take a while, depending on your cpu(s)..." # --no-tcmalloc
+        if [[ $? -gt 0 ]] ; then result=$? ; return $result ; fi
         chmod +x $rvm_ruby_home/bin/*
 
         __rvm_rubygems_setup
@@ -168,7 +169,7 @@ function __rvm_install_ruby {
         __rvm_pushpop
       else
         rvm_url="$(__rvm_db "ree_${rvm_ruby_version}_repo_url")"
-        if [ -z "$rvm_url" ] ; then
+        if [[ -z "$rvm_url" ]] ; then
           __rvm_log "fail" "rvm does not know the rvm repo url for 'ree_${rvm_ruby_version}'"
           result=1
         else
@@ -195,7 +196,7 @@ function __rvm_install_ruby {
       RBX_PREFIX=$rvm_ruby_home ; export RBX_PREFIX
       # Also see 'rakelib/configuration.rake'
 
-      if [ ! -d "$rvm_ruby_src_path" -o ! -d "$rvm_ruby_src_path/.git" ] ; then
+      if [[ ! -d "$rvm_ruby_src_path" ]] || [[ ! -d "$rvm_ruby_src_path/.git" ]] ; then
         rm -rf $rvm_ruby_src_path
         __rvm_run "rbx.repo" "git clone --depth 1 $rvm_ruby_repo_url $rvm_ruby_src_path" "Cloning $rvm_ruby_repo_url"
         cd $rvm_ruby_home
@@ -210,7 +211,7 @@ function __rvm_install_ruby {
       rvm_ruby_interpreter="rbx"
       __rvm_select
 
-      if [ ! -z "$rvm_jit_flag" ]; then
+      if [[ ! -z "$rvm_jit_flag" ]] ; then
         __rvm_run "configure" "./configure --prefix=$rvm_ruby_home --enable-llvm" "Configuring rbx with LLVM enabled"
       else
         __rvm_run "configure" "./configure --prefix=$rvm_ruby_home" "Configuring rbx"
@@ -225,8 +226,8 @@ function __rvm_install_ruby {
 
       __rvm_run "rake.install" "$rvm_ruby_home/bin/rbx gem install rake --no-rdoc --no-ri" "Installing Rake"
       binary=rake
-      if [ -f $rvm_ruby_gem_home/bin/$binary ] ; then
-        if [ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ] ; then
+      if [[ -f $rvm_ruby_gem_home/bin/$binary ]] ; then
+        if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] ; then
           cp $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
         fi
         chmod +x $rvm_ruby_home/bin/$binary
@@ -239,7 +240,7 @@ function __rvm_install_ruby {
 
       binaries="gem" # Trick to work in more shells :)
       for binary_name in $(echo $binaries); do
-        if [ $binary_name != "gem" ] ; then prefix="-S" ; fi
+        if [[ $binary_name != "gem" ]] ; then prefix="-S" ; fi
         ruby_wrapper=$(cat <<RubyWrapper
 #!/bin/bash
 
@@ -255,7 +256,7 @@ RubyWrapper
         for file_name in $(echo $files)  ; do
           rm -f $file_name
           echo "$ruby_wrapper" > $file_name
-          if [ -f $file_name ] ; then chmod +x $file_name ; fi
+          if [[ -f $file_name ]] ; then chmod +x $file_name ; fi
         done ; unset file_name
         unset ruby_wrapper binary_name files prefix
       done
@@ -267,23 +268,23 @@ RubyWrapper
       mkdir -p $rvm_ruby_log_path
       __rvm_pushpop $rvm_src_path
 
-      if [ ! -z "$rvm_ruby_revision" ] ; then
-        if [ ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version -o ! -d $rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version/.git ] ; then
+      if [[ ! -z "$rvm_ruby_revision" ]] ; then
+        if [[ ! -d "$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version" ]] || [[ ! -d "$rvm_path/$rvm_ruby_interpreter-$rvm_ruby_version/.git" ]] ; then
           git clone --depth 1 $rvm_jruby_repo_url $rvm_ruby_src_path
           cd $rvm_ruby_src_path && ant # TODO: Test if 'ant' is installed, if not throw error.
         fi
       else
-        if [ -d $rvm_ruby_src_path ]  ; then
+        if [[ -d $rvm_ruby_src_path ]] ; then
           cd $rvm_ruby_src_path
         else
-          if [ -z "$rvm_force_flag" -a -f $rvm_package_file -a -s $rvm_package_file ] ; then
+          if [[ -z "$rvm_force_flag" ]] && [[ -f $rvm_package_file ]] && [[ -s $rvm_package_file ]] ; then
             __rvm_log "info" "It appears that $rvm_package_file has already been downloaded, skipping. Use --force to force re-download."
           else
             __rvm_log "info" "Downloading $rvm_package_file, this may take a while depending on your connection..."
             __rvm_fetch $rvm_url
           fi
           __rvm_run "extract" "tar zxf $rvm_archives_path/$rvm_package_file.tar.gz -C $rvm_src_path" "Extracting $rvm_package_file..."
-          if [ "$rvm_package_file" != "$rvm_ruby_string" ] ; then
+          if [[ "$rvm_package_file" != "$rvm_ruby_string" ]] ; then
             mv $rvm_src_path/$rvm_package_file $rvm_src_path/$rvm_ruby_string
           fi
           cd $rvm_ruby_src_path
@@ -294,7 +295,7 @@ RubyWrapper
       __rvm_run "nailgun" "cd $rvm_ruby_src_path/tool/nailgun && /usr/bin/make $rvm_make_flags" "Installing $rvm_ruby_package_name..."
       __rvm_pushpop
 
-      if [ -z "$rvm_ruby_home" -o "$rvm_ruby_home" = "/" ] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
+      if [[ -z "$rvm_ruby_home" ]] || [[ "$rvm_ruby_home" = "/" ]] ; then echo "WTH?!?! rvm_ruby_home == / ??? not removing." ; return 1000000 ; fi
       rm -rf $rvm_ruby_home
       __rvm_run "install" "/bin/cp -Rf $rvm_ruby_src_path $rvm_ruby_home" "Installing JRuby to $rvm_ruby_home"
 
@@ -333,31 +334,34 @@ RubyWrapper
 
   esac
 
-  if [ ! -z "$ruby_options" ] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
+  if [[ ! -z "$ruby_options" ]] ; then RUBYOPT=$ruby_options ; export RUBYOPT ; fi
 }
 
 function __rvm_manage_rubies {
   __rvm_state
   rubies=() ; successes=() ; errors=() ; statuses=()
+  unset rvm_gem_set_name
+  rvm_ruby_gem_home=$(echo $rvm_ruby_gem_home | awk -F'%' '{print $1}')
+  rvm_ruby_string=$(echo $rvm_ruby_string | awk -F'%' '{print $1}')
   # TODO: Extract the common functionality out of the if below
-  if [ ! -z "$rvm_ruby_string" ] ; then
+  if [[ ! -z "$rvm_ruby_string" ]] ; then
     unset rvm_ruby_interpreter rvm_ruby_version
     __rvm_${rvm_action}_ruby
-  elif [ ! -z "$rvm_ruby_version" ] ;then
+  elif [[ ! -z "$rvm_ruby_version" ]] ;then
     for rvm_ruby_string in $(echo $rvm_ruby_version | tr ',' ' ') ; do
-      __rvm_${rvm_action}_ruby
+      eval "__rvm_${rvm_action}_ruby"
       __rvm_unset_ruby_variables
     done
-  elif [ ! -z "$rvm_ruby_interpreter" ] ; then
+  elif [[ ! -z "$rvm_ruby_interpreter" ]] ; then
     unset rvm_ruby_string rvm_ruby_version
-    __rvm_${rvm_action}_ruby
+    eval "__rvm_${rvm_action}_ruby"
   else # all
-    if [ "$rvm_action" != "install" ] ; then
+    if [[ "$rvm_action" != "install" ]] ; then
       while read bin_line
       do # Keep this on second line damnit!
-        if [ -x $bin_line ] ; then
-          rvm_ruby_string="$(dirname $bin_line | xargs dirname | xargs basename)"
-          __rvm_${rvm_action}_ruby
+        if [[ -x "$bin_line" ]] ; then
+          rvm_ruby_string="$(dirname "$bin_line" | xargs dirname | xargs basename)"
+          eval "__rvm_${rvm_action}_ruby"
           __rvm_unset_ruby_variables
         fi
       done < <(/bin/ls $rvm_path/*/bin/ruby 2> /dev/null)
@@ -367,23 +371,23 @@ function __rvm_manage_rubies {
   fi
   __rvm_state
 
-  if [ ! -z "$rvm_summary_flag" ] ; then __rvm_summary ; fi
-  if [ ! -z "$rvm_yaml_flag" ]    ; then __rvm_yaml    ; fi
-  if [ ! -z "$rvm_json_flag" ]    ; then __rvm_json    ; fi
+  if [[ ! -z "$rvm_summary_flag" ]] ; then __rvm_summary ; fi
+  if [[ ! -z "$rvm_yaml_flag" ]]   ; then __rvm_yaml    ; fi
+  if [[ ! -z "$rvm_json_flag" ]]   ; then __rvm_json    ; fi
 }
 
 function __rvm_uninstall_ruby {
-  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
 
-  if [ ! -z "$rvm_ruby_package_name" ] ; then
+  if [[ ! -z "$rvm_ruby_package_name" ]] ; then
     for dir in $rvm_path ; do
-      if [ -d $dir/$rvm_ruby_package_name ] ; then
+      if [[ -d $dir/$rvm_ruby_package_name ]] ; then
         __rvm_log "info" "Removing $dir/$rvm_ruby_package_name..."
         rm -rf $dir/$rvm_ruby_package_name
       else
         __rvm_log "info" "$dir/$rvm_ruby_package_name has already been removed."
       fi
-      if [ -e $rvm_bin_path/$rvm_ruby_package_name ] ; then
+      if [[ -e $rvm_bin_path/$rvm_ruby_package_name ]] ; then
         rm -f $rvm_bin_path/$rvm_ruby_package_name
       fi
     done ; unset dir
@@ -394,17 +398,17 @@ function __rvm_uninstall_ruby {
 }
 
 function __rvm_remove_ruby {
-  if [ -z "$rvm_ruby_selected_flag" ] ; then __rvm_select $* ; fi
+  if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select $* ; fi
 
-  if [ ! -z "$rvm_ruby_package_name" ] ; then
+  if [[ ! -z "$rvm_ruby_package_name" ]] ; then
     for dir in $rvm_src_path $rvm_path ; do
-      if [ -d $dir/$rvm_ruby_package_name ] ; then
+      if [[ -d $dir/$rvm_ruby_package_name ]] ; then
         __rvm_log "info" "Removing $dir/$rvm_ruby_package_name..."
         rm -rf $dir/$rvm_ruby_package_name
       else
         __rvm_log "info" "it seems that $dir/$rvm_ruby_package_name is already non existent."
       fi
-      if [ -e $rvm_bin_path/$rvm_ruby_package_name ] ; then
+      if [[ -e $rvm_bin_path/$rvm_ruby_package_name ]] ; then
         rm -f $rvm_bin_path/$rvm_ruby_package_name
       fi
     done ; unset dir
@@ -416,15 +420,15 @@ function __rvm_remove_ruby {
 function __rvm_post_install {
   binaries="${binaries:-"gem irb erb ri rdoc testrb rake"}"
   for binary in $(echo $binaries) ; do
-    if [ -e $rvm_ruby_home/bin/$binary -o -e $rvm_ruby_src_path/bin/$binary ] ; then
-      if [ "$rvm_ruby_src_path" != "$rvm_ruby_home" -a -f $rvm_ruby_src_path/bin/$binary ] ; then
-        cp -f $rvm_ruby_src_path/bin/$binary $rvm_ruby_home/bin/$binary
-      elif [ -f "$rvm_ruby_gem_home/bin/$binary" ] ; then
-        cp -f $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
+    if [[ -e "$rvm_ruby_home/bin/$binary" ]] || [[ -e "$rvm_ruby_src_path/bin/$binary" ]] ; then
+      if [[ "$rvm_ruby_src_path" != "$rvm_ruby_home" ]] && [[ -f "$rvm_ruby_src_path/bin/$binary" ]] ; then
+        cp -f "$rvm_ruby_src_path/bin/$binary" "$rvm_ruby_home/bin/$binary"
+      elif [[ -f "$rvm_ruby_gem_home/bin/$binary" ]] ; then
+        cp -f "$rvm_ruby_gem_home/bin/$binary" "$rvm_ruby_home/bin/$binary"
       fi
-      __rvm_inject_gem_env $rvm_ruby_home/bin/$binary
-      __rvm_inject_ruby_shebang $rvm_ruby_home/bin/$binary
-      chmod +x $rvm_ruby_home/bin/$binary
+      __rvm_inject_gem_env "$rvm_ruby_home/bin/$binary"
+      __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
+      chmod +x "$rvm_ruby_home/bin/$binary"
     fi
   done ; unset binary binaries
 
@@ -437,8 +441,8 @@ function __rvm_post_install {
   __rvm_log "info" "Installation of gems for $rvm_ruby_package_name is complete."
 
   binary=rake
-  if [ -x $rvm_ruby_gem_home/bin/$binary ] ; then
-    if [ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ] ; then
+  if [[ -x $rvm_ruby_gem_home/bin/$binary ]] ; then
+    if [[ "$rvm_ruby_gem_home" != "$rvm_ruby_home" ]] ; then
       cp $rvm_ruby_gem_home/bin/$binary $rvm_ruby_home/bin/$binary
     fi
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/$binary"
@@ -447,7 +451,7 @@ function __rvm_post_install {
 }
 
 function __rvm_rubygems_setup {
-  if [ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ] ; then
+  if [[ ! -z "$(echo $rvm_ruby_version | awk '/^1\.9/')" ]] ; then
     # 1.9 has it's own built-in gem command
     __rvm_inject_ruby_shebang "$rvm_ruby_src_path/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
@@ -456,24 +460,24 @@ function __rvm_rubygems_setup {
     __rvm_inject_ruby_shebang "$rvm_ruby_home/bin/gem"
     __rvm_inject_gem_env "$rvm_ruby_home/bin/gem"
 
-  elif [ ! -z "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ] ; then
+  elif [[ ! -z "$(echo $rvm_ruby_interpreter | awk '/^rbx|jruby/')" ]] ; then
     __rvm_log "debug" "Skipping rubygems update for $rvm_ruby_version"
 
   else
     __rvm_log "info" "Installing rubygems dedicated to $rvm_ruby_package_name..."
     rvm_gem_package_name="rubygems-1.3.5"
     rvm_gem_url="http://rubyforge.org/frs/download.php/60718/$rvm_gem_package_name.tgz"
-    if [ -d $rvm_src_path/$rvm_gem_package_name ]  ; then
-      cd $rvm_src_path/$rvm_gem_package_name
+    if [[ -d "$rvm_src_path/$rvm_gem_package_name" ]] ; then
+      cd "$rvm_src_path/$rvm_gem_package_name"
     else
       __rvm_log "info" "Retrieving $rvm_gem_package_name"
-      __rvm_fetch $rvm_gem_url
-      mkdir -p $rvm_src_path/$rvm_gem_package_name
+      __rvm_fetch "$rvm_gem_url"
+      mkdir -p "$rvm_src_path/$rvm_gem_package_name"
       __rvm_run "rubygems.extract" "tar zxf $rvm_archives_path/$rvm_gem_package_name.tgz -C $rvm_src_path" "Extracting $rvm_gem_package_name"
     fi
     __rvm_run "rubygems.install" "GEM_PATH=$rvm_gem_path GEM_HOME=$rvm_ruby_gem_home $rvm_ruby_home/bin/ruby $rvm_src_path/$rvm_gem_package_name/setup.rb" "Installing rubygems for $rvm_ruby_home/bin/ruby"
     result=$?
-    if [ $result -eq 0 ] ; then
+    if [[ $result -eq 0 ]] ; then
       __rvm_log "info" "Installation of rubygems $rvm_ruby_package_name completed successfully."
     else
       __rvm_log "warning" "Installation of rubygems $rvm_ruby_package_name did not complete successfully."
@@ -485,30 +489,30 @@ function __rvm_rubygems_setup {
 
 function __rvm_inject_ruby_shebang {
   __rvm_actual_file $1
-  if [ -f $actual_file ] ; then
+  if [[ -f "$actual_file" ]] ; then
     sed -i.orig -e "s=env [j]*ruby=env $rvm_ruby_home/bin/ruby=" $actual_file
-    rm -f $actual_file.orig ; chmod +x $actual_file
+    rm -f $actual_file.orig ; chmod +x "$actual_file"
   fi ; unset actual_file
 }
 
 function __rvm_inject_gem_env {
   __rvm_actual_file $1
-  if [ -f $actual_file ] ; then
-    if [ ! -z "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ] ; then
+  if [[ -f "$actual_file" ]] ; then
+    if [[ ! -z "$(head -n 1 $actual_file | awk '/[j]*ruby/')" ]] ; then
       string="ENV['GEM_HOME']=ENV['GEM_HOME'] || '$rvm_ruby_gem_home'\nENV['GEM_PATH']=ENV['GEM_PATH'] || '$rvm_ruby_gem_home'\nENV['PATH']='$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:' + ENV['PATH']"
-    elif [ ! -z "$(head -n 1 $actual_file | awk '/bash/')" ] ; then
+    elif [[ ! -z "$(head -n 1 $actual_file | awk '/bash/')" ]] ; then
       string="GEM_HOME=\${GEM_HOME:-'$rvm_ruby_gem_home'}\nGEM_PATH=\${GEM_PATH:-'$rvm_ruby_gem_home'}\nPATH=$rvm_ruby_home/bin:$rvm_ruby_gem_home/bin:\$PATH"
     fi
-    if [ ! -z "$string" ] ; then
-      awk "NR==2 {print \"$string\"} {print}" $actual_file > $actual_file.new
-      mv $actual_file.new $actual_file ; chmod +x $actual_file
+    if [[ ! -z "$string" ]] ; then
+      awk "NR==2 {print \"$string\"} {print}" "$actual_file" > "$actual_file.new"
+      mv $actual_file.new $actual_file ; chmod +x "$actual_file"
       unset string
     fi
   fi ; unset actual_file
 }
 
 function __rvm_actual_file {
-  if [ -L $1 ] ; then         # If the file is a symlink,
+  if [[ -L $1 ]] ; then         # If the file is a symlink,
     actual_file="$(readlink $1)" # read the link target so we can preserve it.
   else
     actual_file="$1"