rvm 1.0.1 → 1.0.2

data/scripts/completion

@@ -33,6 +33,20 @@ __rvm_gemsets ()
   echo "$(rvm gemset list | \grep -v gemset 2>/dev/null)"
 }
 
+__rvm_help_pages ()
+{
+  ls "$rvm_path/help"
+}
+
+__rvm_known ()
+{
+  # Strips comments and expands known patterns into each variation
+  rvm list known | sed 's/#.*$//' | sed '\
+    s/^(\([^)]*\))\(.*\)(\([^)]*\))$/\1\2\3 \1\2 \2\3 \2/\
+    s/^(\([^)]*\))\(.*\)$/\1\2 \2/\
+    s/^\(.*\)(\([^)]*\))$/\1\2 \1/'
+}
+
 _rvm_commands ()
 {
   local cur=${COMP_WORDS[COMP_CWORD]}
@@ -41,7 +55,8 @@ _rvm_commands ()
         version use reload implode update reset info debug\
         install uninstall remove\
         ruby gem rake tests specs monitor gemset\
-        gemdir srcdir fetch list package notes snapshot'
+        gemdir srcdir fetch list package notes snapshot\
+        help'
 
   case "${cur}" in
   -*)       _rvm_opts ;;
@@ -105,6 +120,16 @@ _rvm_gemset ()
   fi
 }
 
+_rvm_help ()
+{
+  __rvm_comp "$(__rvm_help_pages)"
+}
+
+_rvm_install ()
+{
+  __rvm_comp "$(__rvm_known)"
+}
+
 _rvm ()
 {
   local prev=${COMP_WORDS[COMP_CWORD-1]}
@@ -112,6 +137,8 @@ _rvm ()
   case "${prev}" in
   use)      _rvm_use ;;
   gemset)   _rvm_gemset ;;
+  help)     _rvm_help ;;
+  install)  _rvm_install ;;
   *)        _rvm_commands ;;
   esac
 

data/scripts/docs

@@ -4,7 +4,7 @@ source "$rvm_scripts_path/base"
 
 rvm_docs_ruby_string="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
 if [[ "$rvm_docs_ruby_string" = "system" || -z "$rvm_docs_ruby_string" ]]; then
-  $rvm_scripts_path/log "error" "Currently 'rvm docs ...' does not work with non-rvm rubies."
+  "$rvm_scripts_path"/log "error" "Currently 'rvm docs ...' does not work with non-rvm rubies."
   exit 1
 fi
 
@@ -23,22 +23,22 @@ usage() {
 open_docs() {
   if [[ -s "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/index.html" ]] ; then
     if command -v open >/dev/null ; then
-      open $rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/index.html
+      open "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/index.html"
     elif command -v xdg-open >/dev/null ; then
-      xdg-open $rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/index.html
+      xdg-open "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/index.html"
     else
-      $rvm_scripts_path/log "error" "Neither open nor xdg-open were found, in order to open the docs one of these two are required. \n(OR you can let me know how else to open the html in your browser from comand line on your OS :) )"
+      "$rvm_scripts_path"/log "error" "Neither open nor xdg-open were found, in order to open the docs one of these two are required. \n(OR you can let me know how else to open the html in your browser from comand line on your OS :) )"
     fi
   else
-    $rvm_scripts_path/log "error" "$rvm_docs_type docs are missing, perhaps run 'rvm docs generate' first?"
+    "$rvm_scripts_path"/log "error" "$rvm_docs_type docs are missing, perhaps run 'rvm docs generate' first?"
   fi
 }
 
 generate_ri() {
   # Generate ri docs
   __rvm_pushpop "$rvm_src_path/$rvm_docs_ruby_string/"
-  $rvm_scripts_path/log "info" "Generating ri documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
-  $rvm_scripts_path/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
+  "$rvm_scripts_path"/log "info" "Generating ri documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
+  "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
   rdoc -a --ri --ri-site > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log
   __rvm_pushpop
 }
@@ -46,12 +46,12 @@ generate_ri() {
 generate_rdoc() {
   __rvm_pushpop "$rvm_src_path/$rvm_docs_ruby_string/"
   \rm -rf "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type/"
-  $rvm_scripts_path/log "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
-  $rvm_scripts_path/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
+  "$rvm_scripts_path"/log "info" "Generating rdoc documentation, be aware that this could take a *long* time, and depends heavily on your system resources..."
+  "$rvm_scripts_path"/log "info" "( Errors will be logged to $rvm_log_path/$rvm_docs_ruby_string/docs.error.log )"
   if gem list | \grep -q ^hanna ; then
-    hanna -o $rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type --inline-source --line-numbers --fmt=html > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log
+    hanna -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" --inline-source --line-numbers --fmt=html > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log"
   else
-    rdoc -a -o $rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type > /dev/null 2>> $rvm_log_path/$rvm_docs_ruby_string/docs.error.log
+    rdoc -a -o "$rvm_docs_path/$rvm_docs_ruby_string/$rvm_docs_type" > /dev/null 2>> "$rvm_log_path/$rvm_docs_ruby_string/docs.error.log"
   fi
   __rvm_pushpop
 }

data/scripts/fetch

@@ -17,17 +17,17 @@ record_md5() {
   else
     archive_md5="$(md5sum "${archive}" | awk '{print $1}')"
   fi
-  $rvm_scripts_path/db "$rvm_config_path/md5" "$archive" "$archive_md5"
+  "$rvm_scripts_path/db" "$rvm_config_path/md5" "$archive" "$archive_md5"
 }
 
 builtin cd "$rvm_archives_path"
 
-if [[ -z "$1" ]] ; then $rvm_scripts_path/log "fail" "BUG: $0 called without an argument :/" ; exit 1 ; fi
+if [[ -z "$1" ]] ; then "$rvm_scripts_path/log" "fail" "BUG: $0 called without an argument :/" ; exit 1 ; fi
 
 url="$1"; download=1 ; package_name="$2"
 
 if ! command -v curl > /dev/null ; then
-  $rvm_scripts_path/log "fail" "rvm requires curl. curl was not found in your active path."
+  "$rvm_scripts_path/log" "fail" "rvm requires curl. curl was not found in your active path."
   exit 1
 elif [[ ! -z ${rvm_proxy} ]] ; then
   fetch_command="curl -x${rvm_proxy} -L --create-dirs -C - " # -s for silent
@@ -43,22 +43,22 @@ else
   archive=$(basename "$url")
 fi
 
-if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Fetching $archive" ; fi
+if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Fetching $archive" ; fi
 
 # Check first if we have the correct archive
 archive_md5="$($rvm_scripts_path/db "$rvm_config_path/md5" "$archive" | head -n1)"
 if [[ -e "$archive" ]] && [[ ! -z "$archive_md5" ]] ; then
-  if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Found archive and its md5, testing correctness" ; fi
-  if ! $rvm_scripts_path/md5 "${rvm_archives_path}/${archive}" "$archive_md5" ; then
-    if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Archive is bad, downloading" ; fi
+  if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Found archive and its md5, testing correctness" ; fi
+  if ! "$rvm_scripts_path"/md5 "${rvm_archives_path}/${archive}" "$archive_md5" ; then
+    if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Archive is bad, downloading" ; fi
     download=1
   else
-    if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Archive is good, not downloading" ; fi
+    if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Archive is good, not downloading" ; fi
     download=0
     result=0
   fi ; unset archive_md5
 else
-  if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "No archive or no MD5, downloading" ; fi
+  if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "No archive or no MD5, downloading" ; fi
   download=1
 fi
 
@@ -73,18 +73,18 @@ if [[ $download -gt 0 ]] ; then
     retry=0
     try_http=0
     if [[ $result -eq 78 ]] ; then
-      $rvm_scripts_path/log "error" "The requested url does not exist: '$url'"
+      "$rvm_scripts_path/log" "error" "The requested url does not exist: '$url'"
       try_http=1
     elif [[ $result -eq 18 ]] ; then
-      $rvm_scripts_path/log "error" "Partial file. Only a part of the file was transferred. Removing partial and re-trying."
+      "$rvm_scripts_path/log" "error" "Partial file. Only a part of the file was transferred. Removing partial and re-trying."
       \rm -f "$archive"
       retry=1
     elif [[ $result -eq 33 ]] ; then
-      if [[ ! -z "$rvm_debug_flag" ]] ; then $rvm_scripts_path/log "debug" "Server does not support 'range' command, removing '$archive'" ; fi
+      if [[ ! -z "$rvm_debug_flag" ]] ; then "$rvm_scripts_path/log" "debug" "Server does not support 'range' command, removing '$archive'" ; fi
       \rm -f "$archive"
       retry=1
     else
-      $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log. Next we'll try to fetch via http."
+      "$rvm_scripts_path/log" "error" "There was an error, please check $rvm_ruby_log_path/*.error.log. Next we'll try to fetch via http."
       try_http=1
     fi
 
@@ -92,7 +92,7 @@ if [[ $download -gt 0 ]] ; then
       eval $fetch_command "$url"
       result=$?
       if [[ $result -gt 0 ]] ; then
-        $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+        "$rvm_scripts_path/log" "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
       else
         record_md5
       fi
@@ -102,7 +102,7 @@ if [[ $download -gt 0 ]] ; then
       eval $fetch_command "$http_url"
       result=$?
       if [[ $result -gt 0 ]] ; then
-        $rvm_scripts_path/log "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
+        "$rvm_scripts_path/log" "error" "There was an error, please check $rvm_ruby_log_path/*.error.log"
       else
         record_md5
       fi

data/scripts/gemsets

@@ -15,13 +15,13 @@ usage() {
 
 gemset_update() {
   if [[ -z "$rvm_ruby_strings" ]]; then
-    $rvm_scripts_path/log "info" "Running gem update for all rubies and gemsets."
+    "$rvm_scripts_path/log" "info" "Running gem update for all rubies and gemsets."
     rvm_ruby_strings="$(\ls "$rvm_gems_path" | \grep -v '^\(doc\|cache\|@\|system\)' | \tr '\n' ',')"
   else
-    $rvm_scripts_path/log "info" "Running gem update for the specified rubies."
+    "$rvm_scripts_path/log" "info" "Running gem update for the specified rubies."
   fi
   export rvm_ruby_strings
-  $rvm_scripts_path/set "gem" "update"
+  "$rvm_scripts_path/set" "gem" "update"
   return $?
 }
 
@@ -35,32 +35,32 @@ gemset_globalcache() {
     else
       gc_status="Disabled"
     fi
-    $rvm_scripts_path/log "info" "Gemset global cache is currently: $gc_status"
+    "$rvm_scripts_path/log" "info" "Gemset global cache is currently: $gc_status"
     return "$globalcache_enabled"
   elif [[ "$1" == "disable" ]]; then
-    $rvm_scripts_path/log "info" "Removing the global cache (note: this will empty the caches)"
+    "$rvm_scripts_path/log" "info" "Removing the global cache (note: this will empty the caches)"
     for directory_name in $(\ls "$rvm_gems_path"); do
       current_cache_path="$rvm_gems_path/$directory_name/cache"
       if [[ -L "$current_cache_path" && "$(readlink "$current_cache_path")" == "$rvm_gems_cache_path" ]]; then
-        $rvm_scripts_path/log "info" "Reverting the gem cache for $directory_name to an empty directory."
+        "$rvm_scripts_path/log" "info" "Reverting the gem cache for $directory_name to an empty directory."
         \rm -f "$current_cache_path" 2>/dev/null
         \mkdir -p "$current_cache_path" 2>/dev/null
       fi
     done; unset full_directory_path directory_name
-    $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" "delete"
+    "$rvm_scripts_path/db" "$rvm_config_path/user" "use_gemset_globalcache" "delete"
   elif [[ "$1" == "enable" ]]; then
-    $rvm_scripts_path/log "info" "Enabling global cache for gems."
+    "$rvm_scripts_path/log" "info" "Enabling global cache for gems."
     \mkdir -p "$rvm_gems_cache_path"
     for directory_name in $(\ls "$rvm_gems_path"); do
       current_cache_path="$rvm_gems_path/$directory_name/cache"
       if [[ -d "$current_cache_path" && ! -L "$current_cache_path" ]]; then
-        $rvm_scripts_path/log "info" "Moving the gem cache for $directory_name to the global cache."
+        "$rvm_scripts_path/log" "info" "Moving the gem cache for $directory_name to the global cache."
         mv "$current_cache_path/"*.gem "$rvm_gems_cache_path/" 2>/dev/null
         \rm -rf "$current_cache_path"
         ln -nfs "$rvm_gems_cache_path" "$current_cache_path"
       fi
     done; unset full_directory_path directory_name
-    $rvm_scripts_path/db "$rvm_config_path/user" "use_gemset_globalcache" "true"
+    "$rvm_scripts_path/db" "$rvm_config_path/user" "use_gemset_globalcache" "true"
   else
     printf "Usage: 'rvm gemset globalcache {enable,disable}\n"
     printf "        Enable / Disable the use of a global gem cachedir.\n"
@@ -80,7 +80,7 @@ gemset_create() {
   rvm_ruby_gem_prefix=$(echo $rvm_ruby_gem_home | sed 's/'${rvm_gemset_separator}'.*$//')
   for gemset in $(echo $gems_args) ; do
     if [[ "$gemset" == *"${rvm_gemset_separator}"* ]]; then
-      $rvm_scripts_path/log "error" "Can't do that, it contains a \"${rvm_gemset_separator}\"."
+      "$rvm_scripts_path/log" "error" "Can't do that, it contains a \"${rvm_gemset_separator}\"."
       continue
     fi
     gem_home="${rvm_ruby_gem_prefix}${rvm_gemset_separator}${gemset}"
@@ -93,23 +93,23 @@ gemset_create() {
       fi
       ln -nfs "$rvm_gems_cache_path" "$gem_home/cache"
     fi
-    $rvm_scripts_path/log "info" "Gemset '$gemset' created."
+    "$rvm_scripts_path/log" "info" "Gemset '$gemset' created."
   done ; unset gem_home
 }
 
 gemset_list() {
   if [[ -z "$rvm_ruby_selected_flag" ]] ; then __rvm_select ; fi
 
-  $rvm_scripts_path/log "info" "gemsets : for $rvm_ruby_string (found in $rvm_gems_path/)"
+  "$rvm_scripts_path/log" "info" "gemsets : for $rvm_ruby_string (found in $rvm_gems_path/)"
 
   if [[ ! -z "$rvm_gems_path" ]] ; then
-    if [[ ! -z $rvm_ruby_string ]] ; then
-      \ls ${rvm_gems_path}/ | awk -F"${rvm_gemset_separator}" "/${rvm_ruby_string}${rvm_gemset_separator}/{print \$2}" 2>/dev/null
+    if [[ ! -z "$rvm_ruby_string" ]] ; then
+      \ls "${rvm_gems_path}/" | awk -F"${rvm_gemset_separator}" "/${rvm_ruby_string}${rvm_gemset_separator}/{print \$2}" 2>/dev/null
     else
-      $rvm_scripts_path/log "error" "\$rvm_ruby_string is not set!"
+      "$rvm_scripts_path/log" "error" "\$rvm_ruby_string is not set!"
     fi
   else
-    $rvm_scripts_path/log "error" "\$rvm_gems_path is not set!"
+    "$rvm_scripts_path/log" "error" "\$rvm_gems_path is not set!"
   fi
 }
 
@@ -120,20 +120,20 @@ gemset_delete() {
     if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
         \rm -rf  "$gemdir"
     elif [[ -d "$gemdir" ]] ; then
-      $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the entire gemset directory '$rvm_gemset_name' ($gemdir)?"
+      "$rvm_scripts_path/log" "warn" "Are you SURE you wish to remove the entire gemset directory '$rvm_gemset_name' ($gemdir)?"
       echo -n "(anything other than 'yes' will cancel) > "
       read response
       if [[ "yes" = "$response" ]] ; then
         \rm -f $gemdir/cache 2>/dev/null
         \rm -rf $gemdir
       else
-        $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
+        "$rvm_scripts_path/log" "info" "Not doing anything, phew... close call that one eh?"
       fi
     else
-      $rvm_scripts_path/log "info" "$gemdir already does not exist."
+      "$rvm_scripts_path/log" "info" "$gemdir already does not exist."
     fi ; unset gemdir
   else
-    $rvm_scripts_path/log "error" "A gemset name must be specified in order to delete a gems."
+    "$rvm_scripts_path/log" "error" "A gemset name must be specified in order to delete a gems."
   fi
 }
 
@@ -141,28 +141,28 @@ gemset_empty() {
   if [[ -z "$rvm_ruby_gem_home" ]] ; then __rvm_select ; fi
   gemdir="$rvm_ruby_gem_home"
   if [[ -d "$gemdir" ]] && [[ "$gemdir" != '/' ]] && [[ ! -z "$rvm_force_flag" ]] ; then
-    builtin cd $gemdir && \rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
+    builtin cd "$gemdir" && \rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
   elif [[ -d "$gemdir" ]] ; then
-    $rvm_scripts_path/log "warn" "Are you SURE you wish to remove the installed gemset for gemset '$(basename $gemdir)' ($gemdir)?"
+    "$rvm_scripts_path/log" "warn" "Are you SURE you wish to remove the installed gemset for gemset '$(basename "$gemdir")' ($gemdir)?"
     echo -n "(anything other than 'yes' will cancel) > "
     read response
     if [[ "yes" = "$response" ]] ; then
-      builtin cd $gemdir && \rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
+      builtin cd "$gemdir" && \rm -rf ./bin/* ./doc/* ./gems/* ./specifications/*
     else
-      $rvm_scripts_path/log "info" "Not doing anything, phew... close call that one eh?"
+      "$rvm_scripts_path/log" "info" "Not doing anything, phew... close call that one eh?"
     fi
   else
-    $rvm_scripts_path/log "info" "$gemdir already does not exist."
+    "$rvm_scripts_path/log" "info" "$gemdir already does not exist."
   fi ; unset gemdir
 }
 
 # Migrate gemsets from ruby X to ruby Y
 gemset_copy() {
-  local source_ruby="$(echo "$gems_args" | awk '{print $1}')"
-  local destination_ruby="$(echo "$gems_args" | awk '{print $2}')"
+  local source_ruby="${gems_args/ */}"
+  local destination_ruby="${gems_args/* /}"
 
   if [[ -z "$destination_ruby" || -z "$source_ruby" ]] ; then
-    $rvm_scripts_path/log "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
+    "$rvm_scripts_path/log" "error" "Source and destination must be specified: 'rvm gemset copy X Y'"
     return 1
   fi
 
@@ -170,26 +170,26 @@ gemset_copy() {
   local destination_path="$(rvm_silence_logging=1 rvm "$destination_ruby" gem env gemdir)"
 
   if [[ -z "$source_path" ]]; then
-    $rvm_scripts_path/log "error" "Unable to expand ruby '$source_ruby'"
+    "$rvm_scripts_path/log" "error" "Unable to expand ruby '$source_ruby'"
     return 1
   fi
 
   if [[ -z "$destination_path" ]]; then
-    $rvm_scripts_path/log "error" "Unable to expand ruby '$destination_ruby'"
+    "$rvm_scripts_path/log" "error" "Unable to expand ruby '$destination_ruby'"
     return 1
   fi
 
   if [[ -d "$source_path" ]] ; then
     [[ ! -d "$destination_path" ]] && \mkdir -p "$destination_path"
-    $rvm_scripts_path/log "info" "Copying gemset from $source_ruby to $destination_ruby"
+    "$rvm_scripts_path/log" "info" "Copying gemset from $source_ruby to $destination_ruby"
     for dir in bin doc gems specifications cache ; do
       \mkdir -p "$destination_path/$dir"
       \cp -Rf "$source_path/$dir" "$destination_path/"
     done
-    $rvm_scripts_path/log "info" "Making gemset for $destination_ruby pristine."
+    "$rvm_scripts_path/log" "info" "Making gemset for $destination_ruby pristine."
     __rvm_run_with_env "gemset.pristine" "$destination_ruby" "rvm gemset pristine"
   else
-    $rvm_scripts_path/log "error" "Gems directory does not exist for $source_path ($source_path)"
+    "$rvm_scripts_path/log" "error" "Gems directory does not exist for $source_path ($source_path)"
     return 1
   fi
 }
@@ -211,14 +211,14 @@ gemset_export() {
     fi
   fi
 
-  $rvm_scripts_path/log "info" "Exporting current environments gemset to $rvm_file_name"
+  "$rvm_scripts_path/log" "info" "Exporting current environments gemset to $rvm_file_name"
 
-  \touch $rvm_file_name
-  echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > $rvm_file_name
+  \touch "$rvm_file_name"
+  echo "# $rvm_file_name generated gem export file. Note that any env variable settings will be missing. Append these after using a ';' field separator" > "$rvm_file_name"
   for gem in $(gem list | sed 's#[\(|\)]##g' | sed 's#, #,#g' | \tr ' ' ';') ; do
-    name="$(echo $gem | awk -F';' '{print $1}')"
+    name="${gem/;*/}"
     if [[ -z "$rvm_latest_flag" ]] ; then
-      versions="$(echo $gem | awk -F';' '{print $2}' | sed 's#,# #g')"
+      versions="${gem/*;/}" ; versions="${versions//,/ }"
       for version in $versions ; do
         echo "$name -v$version" >> $rvm_file_name
       done ; unset version versions
@@ -236,11 +236,8 @@ gemset_import() {
     export BUNDLE_PATH="$rvm_ruby_gem_home"
   fi
 
-  if [[ ! -z "$(echo "$gems_args" | awk '/\.gem.*$/')" ]] ; then
-    rvm_gemset_name="$(echo "$gems_args" | sed 's#\.gem.*##g' | sed 's# ##g')"
-  else
-    rvm_gemset_name="$(echo "$gems_args" | sed 's# ##g')"
-  fi
+  rvm_gemset_name="${gems_args//.gem*/}"
+  rvm_gemset_name="${gems_args// /}"
 
   if [[ -s "$rvm_gemset_name.gems" ]] ; then
     rvm_file_name="$rvm_gemset_name.gems"
@@ -251,7 +248,7 @@ gemset_import() {
   elif [[ -s ".gems" ]] ; then
     rvm_file_name=".gems"
   else
-    $rvm_scripts_path/log "error" "No *.gems file found."
+    "$rvm_scripts_path/log" "error" "No *.gems file found."
     return 1
   fi
 
@@ -259,34 +256,34 @@ gemset_import() {
 
   if [[ -s "$rvm_file_name" ]] ; then
     echo "Importing  $rvm_file_name file..."
-    rvm_ruby_gem_list=$(\ls $rvm_ruby_gem_home/specifications/ 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
+    rvm_ruby_gem_list=$(\ls "$rvm_ruby_gem_home/specifications/" 2> /dev/null | sed 's#.gems.*$##' 2> /dev/null)
 
     while read -r line
     do # Keep this on 2nd line :(
-      if [[ ! -z "$(echo $line | sed 's/\s//g')" ]] ; then
+      if [[ -n "${line// /}" ]] ; then
         gems_args="$line" ; gem_install
       fi
     done < <(awk '/^[^#]+/{print}' "${rvm_file_name}")
   else
-    $rvm_scripts_path/log "error" "${rvm_file_name} does not exist to import from."
+    "$rvm_scripts_path/log" "error" "${rvm_file_name} does not exist to import from."
   fi
 }
 
 __rvm_parse_gems_args() {
-  gem="$(echo $gems_args | awk -F';' '{print $1}')"
-  gem_prefix="$(echo $gems_args | awk -F';' '{print $2}')"
-  if $rvm_scripts_path/match "$gem" "\.gem$" ; then
-    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##")"
+  gem="${gems_args/;*}"
+  gem_prefix="${gems_args/*;}"
+  if "$rvm_scripts_path/match" "$gem" ".gem$" ; then
+    gem_name="$(basename "${gem/.gem/}" |  awk -F'-' '{$NF=NULL;print}')"
+    gem_version="$(basename "${gem/.gem/}" |  awk -F'-' '{print $NF}' )"
+    gem_postfix="$(basename "${gem/*.gem/}")"
   else
-    gem_name="$(echo $gem | awk '{print $1}')"
-    if $rvm_scripts_path/match "$gem" "--version" ; then
-      gem_version="$(echo $gem | sed 's#.*--version[=]*[ ]*##' | awk '{print $1}')"
-      gem_postfix="$(echo $gem | sed "s#${gem_name/ /}##" | sed "s#--version[=]*[ ]*${gem_version/ /}##")"
-    elif $rvm_scripts_path/match "$gem" "-v" ; then
-      gem_version="$(echo $gem | sed 's#.*-v[=]*[ ]*##' | awk '{print $1}')"
-      gem_postfix="$(echo $gem | sed "s#${gem_name/ /}##" | sed "s#-v[=]*[ ]*${gem_version/ /}##")"
+    gem_name="${gem/ */}"
+    if "$rvm_scripts_path/match" "$gem" "--version" ; then
+      gem_version="$(echo "$gem" | sed -e 's#.*--version[=]*[ ]*##' | awk '{print $1}')"
+      gem_postfix="$(echo "$gem" | sed -e "s#${gem_name/ /}##" -e "s#--version[=]*[ ]*${gem_version/ /}##")"
+    elif "$rvm_scripts_path/match" "$gem" "-v" ; then
+      gem_version="$(echo "$gem" | sed -e 's#.*-v[=]*[ ]*##' | awk '{print $1}')"
+      gem_postfix="$(echo "$gem" | sed -e "s#${gem_name/ /}##" -e "s#-v[=]*[ ]*${gem_version/ /}##")"
     else
       unset gem_version # no version
     fi
@@ -294,7 +291,7 @@ __rvm_parse_gems_args() {
 
   if [[ -s "$gem" ]] ; then
     gem_file_name="$gem"
-  elif $rvm_scripts_path/match "$gem" ".gem$" ; then
+  elif "$rvm_scripts_path/match" "$gem" ".gem$" ; then
     gem_file_name="$gem"
   elif [[ -z "${gem_version/ /}" ]] ; then
     gem_file_name="${gem_name/ /}*.gem"
@@ -310,9 +307,9 @@ gem_install() {
   __rvm_parse_gems_args
 
   # Now we determine if a .gem cache file is already installed
-  if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
+  if [[ -z "$rvm_force_flag" ]] && [[ -f "${rvm_ruby_gem_home}/specifications/$(basename "$gem_file_name")spec" ]] ; then
     unset gem
-    $rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
+    "$rvm_scripts_path/log" "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
   else
     if [[ -s "$gem" ]] ; then
       cache_file="$gem"
@@ -336,7 +333,7 @@ gem_install() {
 
       if [[ -z "$rvm_force_flag" ]] && [[ -s "${rvm_ruby_gem_home}/specifications/$(basename $gem_file_name)spec" ]] ; then
         unset gem # already installed, not forcing reinstall.
-        $rvm_scripts_path/log "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
+        "$rvm_scripts_path/log" "info" "$gem_name $gem_version exists, skipping (--force to re-install)"
       else
         if [[ -s "$(__rvm_current_gemcache_dir)/$(basename $gem_file_name)" ]] ; then
           \mkdir -p "$rvm_tmp_path/$$/"
@@ -363,9 +360,9 @@ gem_install() {
     __rvm_run "gem.install" "$command" "installing ${gem_name} ${gem_version}..."
     result=$?
     if [[ $result -eq 0 ]] ; then
-      $rvm_scripts_path/log "info" "$gem_name $gem_version installed, output logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.log"
+      "$rvm_scripts_path/log" "info" "$gem_name $gem_version installed, output logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.log"
     else
-      $rvm_scripts_path/log "error" "$gem_name $gem_version failed to install, output logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
+      "$rvm_scripts_path/log" "error" "$gem_name $gem_version failed to install, output logged to:\n$rvm_path/log/$rvm_ruby_string/gem.install.error.log"
     fi
   fi ; unset gem gem_prefix gem_name gem_version gem_file_name gem_postfix cache_file gem_file_name gem_string gem_action
 
@@ -391,10 +388,10 @@ gemset_prune() {
   temporary_cache_path="$GEM_HOME/temporary-cache"
   live_cache_path="$GEM_HOME/cache"
   \mkdir -p "$temporary_cache_path"
-  $rvm_scripts_path/log "info" "Moving active gems into temporary cache..."
+  "$rvm_scripts_path/log" "info" "Moving active gems into temporary cache..."
   while read -r used_gem; do
     gem_name="$(echo "$used_gem" | sed -e 's/ .*//')"
-    versions="$(echo "$used_gem" | sed -e 's/.* (//' -e 's/)//' | \tr ', ' ' ')"
+    versions="$(echo "${used_gem//, / }" | sed -e 's/.* (//' -e 's/)//')"
     for version in $versions; do
       cached_gem_name="${gem_name}-${version}.gem"
       cached_file_path="${live_cache_path}/${cached_gem_name}"
@@ -403,7 +400,7 @@ gemset_prune() {
       fi
     done
   done < <(gem list --versions)
-  $rvm_scripts_path/log "info" "Removing live cache and restoring temporary cache..."
+  "$rvm_scripts_path/log" "info" "Removing live cache and restoring temporary cache..."
   # Switch the cache back.
   \rm -rf "$live_cache_path"
   mv "$temporary_cache_path" "$live_cache_path"
@@ -415,7 +412,7 @@ gemset_pristine() {
 
 # Loads the default gemsets for the current interpreter and gemset.
 gemset_initial() {
-  $rvm_scripts_path/log "info" "Importing initial gemsets for $(__rvm_environment_identifier)."
+  "$rvm_scripts_path/log" "info" "Importing initial gemsets for $(__rvm_environment_identifier)."
   \mkdir -p "$rvm_gemsets_path/$(echo "$rvm_ruby_string" | \tr '-' '/')" 2>/dev/null
   for gemsets_path in $(__rvm_ruby_string_paths_under "$rvm_gemsets_path") ; do
     if [[ -n "$rvm_gemset_name" ]] ; then
@@ -431,17 +428,17 @@ gemset_initial() {
       fi
     fi
   done
-  $rvm_scripts_path/log "info" "Installation of gems for $(__rvm_environment_identifier) is complete."
+  "$rvm_scripts_path/log" "info" "Installation of gems for $(__rvm_environment_identifier) is complete."
 }
 
 unset GEM_PATH
 
 if ! command -v gem > /dev/null ; then
-  $rvm_scripts_path/log "error" "'gem' was not found, cannot perform gem actions (Do you have an RVM ruby selected?)"
+  "$rvm_scripts_path/log" "error" "'gem' was not found, cannot perform gem actions (Do you have an RVM ruby selected?)"
   exit 1
 fi
 
-action="$(echo $* | awk '{print $1}')"
+action="$(echo "$*" | awk '{print $1}')"
 gems_args="$(echo "$*" | awk '{$1="" ; print}' | __rvm_strip)"
 export rvm_gemset_name
 
@@ -488,7 +485,7 @@ elif [[ "update" = "$action" ]]; then
 elif [[ "globalcache" = "$action" ]]; then
   gemset_globalcache "$2"
 elif [[ "clear" = "$action" ]] ; then
-  $rvm_scripts_path/log "info" "gemset cleared."
+  "$rvm_scripts_path/log" "info" "gemset cleared."
   exit 0
 else
   usage