rvm 1.0.1 → 1.0.2

data/scripts/help

@@ -4,23 +4,22 @@ source "$rvm_scripts_path/base"
 
 rvm_help_path="${rvm_help_path:-"$rvm_path/help"}"
 
-command="$(echo $* | awk '{print $1}')"
-action="$(echo $* | awk '{print $2}')"
-# Reserved for future use:
-args=$(echo "$*" | awk '{$1=""; $2="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+command="$1" ; shift
+action="$1" ; shift
+args="$(echo $*) " # Strip trailing / leading / extra spacing.
 
 if [[ ! -z "$command" ]] && [[ -s "${rvm_help_path}/${command}" ]] ; then
   if [[ ! -z "$action" ]] && [[ -s "${rvm_help_path}/${command}/${action}" ]] ; then
-    ${PAGER:-less} "${rvm_help_path}/${command}/${action}"
+    "${PAGER:-less}" "${rvm_help_path}/${command}/${action}"
   else
-    ${PAGER:-less} "${rvm_help_path}/${command}"
+    "${PAGER:-less}" "${rvm_help_path}/${command}"
   fi
 else
-  ${PAGER:-less} "${rvm_path:-$HOME/.rvm}/README"
-  $rvm_scripts_path/log "info" "Commands available with 'rvm help':\n\n    $(builtin cd "${rvm_help_path}" ; \ls | \tr "\n" ' ')"
+  "${PAGER:-less}" "${rvm_path:-$HOME/.rvm}/README"
+  "$rvm_scripts_path/log" "info" "Commands available with 'rvm help':\n\n    $(builtin cd "${rvm_help_path}" ; \ls | \tr "\n" ' ')"
 fi
 
-$rvm_scripts_path/log "info" "For additional information please visit RVM's documentation website:\n\n    http://rvm.beginrescueend.com/"
-$rvm_scripts_path/log "info" "If you still cannot find what an answer to your question, find me 'wayneeseguin' in #rvm on irc.freenode.net:\n\n    http://webchat.freenode.net/?channels=rvm\n"
+"$rvm_scripts_path/log" "info" "For additional information please visit RVM's documentation website:\n\n    http://rvm.beginrescueend.com/"
+"$rvm_scripts_path/log" "info" "If you still cannot find what an answer to your question, find me 'wayneeseguin' in #rvm on irc.freenode.net:\n\n    http://webchat.freenode.net/?channels=rvm\n"
 
 exit $?

data/scripts/hook

@@ -2,7 +2,9 @@
 
 if [[ ! -z "$rvm_hook" ]] ; then
   if [[ -s "$rvm_hooks_path/$rvm_hook" ]] ; then
-    if [[ "$rvm_verbose_flag" -eq 1 ]] || [[ "$rvm_debug_flag" -eq 1 ]] ; then $rvm_scripts_path/log "info" "running hook $rvm_hook" ; fi
+    if [[ "$rvm_verbose_flag" -eq 1 ]] || [[ "$rvm_debug_flag" -eq 1 ]] ; then
+      "$rvm_scripts_path/log" "info" "running hook $rvm_hook"
+    fi
     source "$rvm_hooks_path/$rvm_hook"
   fi
 fi ; unset rvm_hook

data/scripts/info

@@ -76,7 +76,7 @@ info_environment() {
 
 info_debug() {
   rvm_info=$(__rvm_version)
-  rvm_info="$rvm_info\n$($rvm_scripts_path/info "$rvm_ruby_string" "" )"
+  rvm_info="$rvm_info\n$("$rvm_scripts_path/info" "$rvm_ruby_string" "" )"
   rvm_info="$rvm_info\nPATH:\n$(printf $PATH | awk -F":" '{print $1":"$2":"$3":"$4":"$5}' )"
   rvm_info="$rvm_info\nuname -a: $(uname -a)"
   rvm_info="$rvm_info\npermissions: $(\ls -la $rvm_path{,/rubies})"
@@ -113,17 +113,19 @@ info_debug() {
 }
 
 info_sections() {
-  for section in $(echo $sections | \tr ',' ' ') ; do
+  for section in $(printf "${sections//,/ }") ; do
     unset rvm_info ; "info_${section}" ; printf "$rvm_info"
   done
 }
 
 args="$*"
-ruby_strings="$(echo "$args" | awk '{print $1}')"
-sections=$(echo "$args" | awk '{$1="" ; print}' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+ruby_strings="${args/ */}"
+sections="${args#* }"
+sections="${sections#"${sections%%[![:space:]]*}"}" # strip leading whitespace
+sections="${sections%"${sections##*[![:space:]]}"}" # strip trailing whitespace
 all_sections="system rvm ruby homes binaries environment"
 
-if $rvm_scripts_path/match "$all_sections debug" "${ruby_strings/,*/}" ; then
+if "$rvm_scripts_path/match" "$all_sections debug" "${ruby_strings/,*/}" ; then
   sections="$ruby_strings"
   ruby_strings=""
 fi
@@ -134,7 +136,7 @@ if [[ -z "$ruby_strings" ]] ; then
   printf "$(__rvm_environment_identifier):\n"
   info_sections
 else
-  for ruby_string in $(printf $ruby_strings | \tr ',' ' ') ; do
+  for ruby_string in $(printf ${ruby_strings//,/ }) ; do
     __rvm_become "$ruby_string"
     printf "$(__rvm_environment_identifier):\n"
     info_sections

data/scripts/install

@@ -76,7 +76,7 @@ if [[ -z "$rvm_path" ]] ; then rvm_path="${rvm_prefix}rvm" ; fi
 
 source scripts/initialize
 
-if \grep -q 'scripts/rvm' $HOME/.bash* 2>/dev/null || \grep -q 'scripts/rvm' $HOME/.zsh* 2>/dev/null; then
+if \grep -q 'scripts/rvm' "$HOME"/.bash* 2>/dev/null || \grep -q 'scripts/rvm' "$HOME"/.zsh* 2>/dev/null; then
   if [[ -d "$rvm_path" ]] && [[ -s "${rvm_path}/scripts/rvm" ]] ; then
     export upgrade_flag=1
   else
@@ -93,7 +93,7 @@ __rvm_initialize
 #
 item="$(tput setaf 2)* $(tput sgr0)"
 question="\n$(tput setaf 2)<?>$(tput sgr0)"
-cwd=$PWD
+cwd="$PWD"
 source_path="${source_path:-$cwd}"
 rvm_archives_path="${rvm_archives_path:-"$rvm_path/archives"}"
 rvm_src_path="${rvm_src_path:-"$rvm_path/src"}"
@@ -151,7 +151,7 @@ done ; unset dir_name
 spinner
 if [[ ! -s "$rvm_config_path/user" ]] ; then
   \mkdir -p "$rvm_config_path/"
-  echo '# Users settings file, overrides db file settings and persists across installs.' >> $rvm_config_path/user
+  echo '# Users settings file, overrides db file settings and persists across installs.' >> "$rvm_config_path/user"
 fi
 
 scripts=("monitor" "match" "log" "install" "color" "db" "fetch" "log" "set" "package")
@@ -170,7 +170,7 @@ for file in rvm-prompt rvm rvmsudo rvm-shell rvm-auto-ruby ; do
   \cp -f "$source_path/binscripts/$file" $rvm_bin_path/
 done
 spinner
-chmod +x $rvm_bin_path/*
+chmod +x "$rvm_bin_path"/*
 
 #
 # RC Files
@@ -179,17 +179,17 @@ spinner
 if [[ -n "$rvm_auto_flag" ]] ; then
   printf "Checking rc files... ($rvm_rc_files)"
   if [[ "$rvm_loaded_flag" != "1" ]] ; then
-    for rcfile in $(echo $rvm_rc_files) ; do
+    for rcfile in $(printf $rvm_rc_files) ; do
       if [[ ! -f $rcfile ]] ; then \touch $rcfile ; fi
       if [[ -s "$HOME/.profile" ]] ; then
         if ! \grep -q '.profile' "$rcfile" ; then
           echo "    Adding 'if [[ -s \$HOME/.profile ]] ; then source \$HOME ; fi' to $rcfile."
-          printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> $rcfile
+          printf "\n# rvm-install added line:\nif [[ -s \$HOME/.profile ]] ; then source \$HOME/.profile ; fi\n" >> "$rcfile"
         fi
       fi
       if ! \grep -q "scripts\/rvm" "$rcfile" ; then
         echo "    Adding 'if [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi' to $rcfile."
-        printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> $rcfile
+        printf "\n# rvm-install added:\nif [[ -s $rvm_scripts_path/rvm ]] ; then source $rvm_scripts_path/rvm ; fi\n" >> "$rcfile"
       fi
     done
   fi
@@ -254,26 +254,27 @@ done
 spinner
 printf "\r*" # Stop spinner.
 
-for gemset in $rvm_path/gems/*\%* ; do
+for gemset in "$rvm_path"/gems/*\%* ; do
   new_path=${gemset/\%/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    printf "\n    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
-    mv $gemset $new_path
+    printf "\n    Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
+    mv "$gemset" "$new_path"
   fi
 done
 
-for gemset in $rvm_path/gems/*\+* ; do
+for gemset in "$rvm_path"/gems/*\+* ; do
   new_path=${gemset/\+/${rvm_gemset_separator}}
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    printf "\n    Renaming $(basename $gemset) to $(basename $new_path) for new gemset separator."
+    printf "\n    Renaming $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
     mv $gemset $new_path
   fi
 done
-for gemset in $rvm_path/gems/*\@ ; do
+
+for gemset in "$rvm_path"/gems/*\@ ; do
   new_path=$(echo $gemset | sed -e 's#\@$##')
   if [[ -d "$gemset" ]] && [[ ! -d "$new_path" ]] ; then
-    printf "\n    Fixing: $(basename $gemset) to $(basename $new_path) for new gemset separator."
-    mv $gemset $new_path
+    printf "\n    Fixing: $(basename "$gemset") to $(basename "$new_path") for new gemset separator."
+    mv "$gemset" "$new_path"
   fi
 done
 
@@ -281,18 +282,16 @@ done
 if [[ -s "$rvm_config_path/default" ]]; then
   original_version="$(basename "$(\grep GEM_HOME "$rvm_config_path/default" | awk -F"'" '{print $2}' | sed "s#\%#${rvm_gemset_separator}#")")"
   if [[ -n "$original_version" ]]; then
-    $rvm_scripts_path/alias create default "$original_version" &> /dev/null
-  fi
-  unset original_version
+    "$rvm_scripts_path/alias" create default "$original_version" &> /dev/null
+  fi ; unset original_version
   \rm -rf "$rvm_config_path/default"
 fi
 
 #
 # End of gemset migration.
 #
-
 printf "\n    Correct permissions for base binaries in $rvm_bin_path..."
-\mkdir -p $rvm_bin_path
+\mkdir -p "$rvm_bin_path"
 for file in rvm rvmsudo rvm-shell rvm-auto-ruby; do
   [[ -s "$rvm_bin_path/$file" ]] && chmod +x "$rvm_bin_path/$file"
 done; unset file

data/scripts/list

@@ -14,17 +14,18 @@ list_gemsets() {
   local all_rubies="$(list_strings)"
 
   printf "rvm gemsets\n"
-  for version in $(\ls $rvm_gems_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+  for version in $(\ls "$rvm_gems_path/" 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
     ruby_version_name="$(echo "$version" | awk -F"$rvm_gemset_separator" '{print $1}')"
+
     [[ "$all_rubies" != *"$ruby_version_name"* ]] && continue
-    if [[ -n "$(echo $version | awk '/^jruby-/')" ]] ; then
-      string="[ $($rvm_rubies_path/$ruby_version_name/bin/ruby -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
-    elif [[ -n "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
+
+    if echo "$version" | \grep -q '^jruby-' ; then
+      string="[ $("$rvm_rubies_path/$ruby_version_name/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
+    elif [[ -n "$(echo "$version" | awk '/^maglev-|^macruby-/')" ]] ; then
       string="[ x86_64 ]"
     else
-      string="[ $(file $rvm_rubies_path/$ruby_version_name/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
-    fi
-    unset ruby_version_name
+      string="[ $(file "$rvm_rubies_path/$ruby_version_name/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
+    fi ; unset ruby_version_name
     printf "\n"
     if [[ "$version" = "$current_ruby" ]]; then
       printf "=> "
@@ -34,29 +35,26 @@ list_gemsets() {
     printf "$(tput setaf 2)$version$(tput sgr0) $string"
   done ; unset version
 
-  if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
-    version=$(\grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
+  if [[ -f "$rvm_config_path/default" ]] && [[ -s "$rvm_config_path/default" ]] ; then
+    version=$(\grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n1 | awk -F"'" '{print $2}' | xargs basename --)
     if [[ ! -z "$version" ]] ; then
       printf "\n\nDefault Ruby (for new shells)\n"
-      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
+      string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
       printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
     fi ; unset version
-  fi
-  printf "\n"
-
-  unset current_ruby version selected system_ruby system_version string binary
-  echo
+  fi ; unset current_ruby version selected system_ruby system_version string binary
+  printf "\n\n"
 }
 
 list_default() {
   if [[ "$1" = "string" ]] ; then
-    $rvm_scripts_path/alias show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --
+    "$rvm_scripts_path/alias" show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --
   else
     if [[ -L "$rvm_rubies_path/default" ]]; then
-      version=$($rvm_scripts_path/alias show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --)
+      version=$("$rvm_scripts_path/alias" show default 2>/dev/null | awk -F"$rvm_gemset_separator" '{print $1}' | xargs basename --)
       if [[ ! -z "$version" ]] ; then
         printf "\n\nDefault Ruby (for new shells)\n"
-        string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
+        string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
         printf "\n   $(tput setaf 2)$version$(tput sgr0) $string\n"
       fi ; unset version
     fi
@@ -75,13 +73,13 @@ list_ruby_svn_tags() {
 # Query for valid rvm ruby strings
 # This is meant to be used with scripting.
 list_strings() {
-  echo $(\ls $rvm_rubies_path)
+  \ls "$rvm_rubies_path"
 }
 
 # This is meant to be used with scripting.
 list_gemset_strings() {
   local all_rubies="$(list_strings)"
-  for gemset in $(\ls $rvm_gems_path/ 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
+  for gemset in $(\ls "$rvm_gems_path/" 2>/dev/null | xargs -n1 basename -- | \grep -v '^\(@\|doc$\|cache$\|system$\)' | sort); do
     local ruby_name="$(echo "$gemset" | awk -F$rvm_gemset_separator '{print $1}')"
     [[ "$all_rubies" != *"$ruby_name"* ]] && continue
     echo "$gemset"
@@ -113,23 +111,18 @@ list_rubies_strings() {
 
 list_rubies() {
 
-  if [[ "$1" = "strings" ]]; then
-    list_rubies_strings
-    return 0
-  fi
-
-  echo
+  if [[ "$1" = "strings" ]]; then list_rubies_strings ; return 0 ; fi
 
   current_ruby="$(__rvm_environment_identifier | awk -F"$rvm_gemset_separator" '{print $1}')"
 
-  printf "rvm rubies\n"
-  for version in $(\ls $rvm_rubies_path/ 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
-    if [[ ! -z "$(echo $version | awk '/^jruby-/')" ]] ; then
-      string="[ $($rvm_rubies_path/$version/bin/ruby -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
-    elif [[ ! -z "$(echo $version | awk '/^maglev-|^macruby-/')" ]] ; then
+  printf "\nrvm rubies\n"
+  for version in $(\ls "$rvm_rubies_path/" 2> /dev/null | awk '/[a-z]*-.*/ {print $NF}') ; do
+    if echo "$version" | \grep -q '^jruby-' ; then
+      string="[ $("$rvm_rubies_path/$version/bin/ruby" -v | awk '{print $NF}' | sed -e 's/\[//' -e 's/\]//') ]"
+    elif [[ ! -z "$(echo "$version" | awk '/^maglev-|^macruby-/')" ]] ; then
       string="[ x86_64 ]"
     else
-      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
+      string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
     fi
     printf "\n"
     if [[ "$version" = "$current_ruby" ]]; then
@@ -137,21 +130,19 @@ list_rubies() {
     else
       printf "   "
     fi
+    # TODO: Only use tput for interactive terminal sessions.
     printf "$(tput setaf 2)$version$(tput sgr0) $string"
   done ; unset version
 
-  if [[ -f "$rvm_config_path/default" ]] && [[ -s $rvm_config_path/default ]] ; then
-    version=$(\grep 'MY_RUBY_HOME' $rvm_config_path/default | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
+  if [[ -f "$rvm_config_path/default" ]] && [[ -s "$rvm_config_path/default" ]] ; then
+    version=$(\grep 'MY_RUBY_HOME' "$rvm_config_path/default" | head -n 1 | awk -F"'" '{print $2}' | xargs basename --)
     if [[ ! -z "$version" ]] ; then
       printf "\n\nDefault Ruby (for new shells)\n"
-      string="[ $(file $rvm_rubies_path/$version/bin/ruby | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
+      string="[ $(file "$rvm_rubies_path/$version/bin/ruby" | awk '/x86.64/ {print "x86_64"} /386/ {print "i386"} /ppc/ {print "ppc"}' | \tr "\n" ' ')]"
       printf "\n  $(tput setaf 2)$version$(tput sgr0) $string"
     fi ; unset version
-  fi
-  printf "\n"
-
-  unset current_ruby version selected system_ruby system_version string binary
-  echo
+  fi ; unset current_ruby version selected system_ruby system_version string binary
+  printf "\n\n"
 }
 
 # List all rvm installed rubies, default ruby and system ruby.

data/scripts/maglev

@@ -12,7 +12,7 @@ zipfile=${version}.zip
 case "$system" in
   Linux)
   if [[ "$(uname -sm)" != "Linux x86_64" ]]; then
-    $rvm_scripts_path/log "error" "This script only works on a 64-bit Linux OS."
+    "$rvm_scripts_path/log" "error" "This script only works on a 64-bit Linux OS."
     echo "The result from \"uname -sm\" is \"`uname -sm`\" not \"Linux x86_64\""
     exit 1
   fi
@@ -26,19 +26,19 @@ case "$system" in
   #
   # Check the CPU and Mac OS profile.
   if [[ $CPU_TYPE != "i386" || $CPU_CAPABLE -ne 1 || $MAJOR -lt 10 || $MINOR -lt 5 ]] ; then
-    $rvm_scripts_path/log "error" "This script requires Mac OS 10.5 or later on a 64-bit Intel CPU."
+    "$rvm_scripts_path/log" "error" "This script requires Mac OS 10.5 or later on a 64-bit Intel CPU."
     exit 1
   fi
   ;;
   Solaris-x86)
   if [[ "$(uname -sm)" != "SunOS i86pc" ]]; then
-    $rvm_scripts_path/log "error" "This script only works on a 64-bit Solaris-x86 OS."
+    "$rvm_scripts_path/log" "error" "This script only works on a 64-bit Solaris-x86 OS."
     echo "The result from \"uname -sm\" is \"`uname -sm`\" not \"SunOS i86pc\""
     exit 1
   fi
   ;;
   *)
-  $rvm_scripts_path/log "error" "This script only works on a 64-bit Linux, Mac OS X, or Solaris-x86 machine"
+  "$rvm_scripts_path/log" "error" "This script only works on a 64-bit Linux, Mac OS X, or Solaris-x86 machine"
   echo "The result from \"uname -sm\" is \"`uname -sm`\""
   exit 1
   ;;
@@ -46,23 +46,23 @@ esac
 
 # We should run this as a normal user, not root.
 if [[ `id | cut -f2 -d= | cut -f1 -d\(` -eq 0 ]]; then
-  $rvm_scripts_path/log "error" "This script should be run as a normal user, not root."
+  "$rvm_scripts_path/log" "error" "This script should be run as a normal user, not root."
   exit 1
 fi
 
 # Check that the current directory is writable
 if [[ ! -w "." ]]; then
-  $rvm_scripts_path/log "error" "This script requires write permission on your current directory."
+  "$rvm_scripts_path/log" "error" "This script requires write permission on your current directory."
   \ls -ld $PWD
   exit 1
 fi
 
 # We're good to go. Let user know.
 machine_name="`uname -n`"
-$rvm_scripts_path/log "info" "Starting installation of $version on $machine_name"
+"$rvm_scripts_path/log" "info" "Starting installation of $version on $machine_name"
 
 # Figure out how much total memory is installed
-$rvm_scripts_path/log "info" "Setting up shared memory"
+"$rvm_scripts_path/log" "info" "Setting up shared memory"
 #
 # Ref: http://wiki.finkproject.org/index.php/Shared_Memory_Regions_on_Darwin
 # Ref: http://developer.postgresql.org/pgdocs/postgres/kernel-resources.html
@@ -94,7 +94,7 @@ case "$system" in
   shmall=$(($shmmax / 4096))
   ;;
   *)
-  $rvm_scripts_path/log "error" "Can't determine operating system. Check script."
+  "$rvm_scripts_path/log" "error" "Can't determine operating system. Check script."
   exit 1
   ;;
 esac
@@ -124,22 +124,22 @@ shmallNewMB=$(($shmallNew / 256))
 
 # Increase shmmax if appropriate
 if [[ $shmmaxNew -gt $shmmax ]]; then
-  $rvm_scripts_path/log "info" "Increasing max shared memory segment size to $shmmaxNewMB MB"
+  "$rvm_scripts_path/log" "info" "Increasing max shared memory segment size to $shmmaxNewMB MB"
   [[ $system = "Darwin" ]] && sudo sysctl -w kern.sysv.shmmax=$shmmaxNew
   [[ $system = "Linux" ]] && sudo bash -c "echo $shmmaxNew > /proc/sys/kernel/shmmax"
   [[ $system = "Solaris-x86" ]] && echo "[[Warning]] shmmax must be set manually on Solaris-x86"
 else
-  $rvm_scripts_path/log "info" "No need to increase max shared memory segment size"
+  "$rvm_scripts_path/log" "info" "No need to increase max shared memory segment size"
 fi
 
 # Increase shmall if appropriate
 if [[ $shmallNew -gt $shmall ]]; then
-  $rvm_scripts_path/log "info" "Increasing max shared memory allowed to $shmallNewMB MB"
+  "$rvm_scripts_path/log" "info" "Increasing max shared memory allowed to $shmallNewMB MB"
   [[ $system = "Darwin" ]] && sudo sysctl -w kern.sysv.shmall=$shmallNew
   [[ $system = "Linux" ]] && sudo bash -c "echo $shmallNew > /proc/sys/kernel/shmall"
   [[ $system = "Solaris-x86" ]] && echo "[[Warning]]shmall must be set manually on Solaris-x86"
 else
-  $rvm_scripts_path/log "info" "No need to increase max shared memory allowed"
+  "$rvm_scripts_path/log" "info" "No need to increase max shared memory allowed"
 fi
 
 # At this point, shared memory settings contain the values we want,
@@ -163,30 +163,30 @@ if [[ ! -f /etc/sysctl.conf ]] || [[ "$(\grep -sc "kern.*.shm" /etc/sysctl.conf)
       # Must configure shared memory settings manually.
     ;;
     *)
-      $rvm_scripts_path/log "error" "Can't determine operating system. Check script."
+      "$rvm_scripts_path/log" "error" "Can't determine operating system. Check script."
       exit 1
     ;;
   esac
   # Do nothing on Solaris-x86 since /etc/sysctl.conf is ignored on Solaris 10.
   if [[ "$system" != "Solaris-x86" ]]; then
-    $rvm_scripts_path/log "info" "Adding the following section to /etc/sysctl.conf"
+    "$rvm_scripts_path/log" "info" "Adding the following section to /etc/sysctl.conf"
     cat /tmp/sysctl.conf.$$
     sudo bash -c "cat /tmp/sysctl.conf.$$ >> /etc/sysctl.conf"
     /bin/rm -f /tmp/sysctl.conf.$$
   fi
 else
-  $rvm_scripts_path/log "info" "The following shared memory settings already exist in /etc/sysctl.conf"
+  "$rvm_scripts_path/log" "info" "The following shared memory settings already exist in /etc/sysctl.conf"
   echo "To change them, remove the following lines from /etc/sysctl.conf and rerun this script"
   \grep "kern.*.shm" /etc/sysctl.conf
 fi
 
 # Now setup for NetLDI in case we ever need it.
-$rvm_scripts_path/log "info" "Setting up GemStone netldi service port"
+"$rvm_scripts_path/log" "info" "Setting up GemStone netldi service port"
 if [[ $(\grep -sc "^gs64ldi" /etc/services) -eq 0 ]]; then
   echo '[[Info]] Adding "gs64ldi  50378/tcp" to /etc/services'
   sudo bash -c 'echo "gs64ldi         50378/tcp        # Gemstone netldi"  >> /etc/services'
 else
-  $rvm_scripts_path/log "info" "GemStone netldi service port is already set in /etc/services"
+  "$rvm_scripts_path/log" "info" "GemStone netldi service port is already set in /etc/services"
   echo "To change it, remove the following line from /etc/services and rerun this script"
   \grep "^gs64ldi" /etc/services
 fi