Practice safe sed :)

config/db

@@ -46,6 +46,7 @@ jruby_version=1.5.6
 jruby_repo_url=git://github.com/jruby/jruby.git
 jruby_url=http://jruby.org.s3.amazonaws.com/downloads
 macruby_version=0.8
+macruby_nightly_version=0.9
 macruby_url=http://www.macruby.org/files
 macruby_repo_url=git://git.macruby.org/macruby/MacRuby.git
 macruby_nightly_url=http://www.macruby.org/files/nightlies/macruby_nightly-latest.pkg

scripts/cli

@@ -105,8 +105,8 @@ __rvm_parse_args()
           if [[ -n "$next_token" ]] ; then rvm_gemset_name="$next_token" ; else rvm_gemset_name="" ; fi
 
           if echo $rvm_gemset_name | \grep -q ${rvm_gemset_separator:-"@"} ; then
-            rvm_ruby_string=$(echo $rvm_gemset_name | sed -e 's/\(.*\)'"${rvm_gemset_separator:-"@"}"'.*/\1/')
-            rvm_gemset_name=$(echo $rvm_gemset_name | sed -e 's/.*'"${rvm_gemset_separator:-"@"}"'\(.*\)/\1/')
+            rvm_ruby_string=$(echo $rvm_gemset_name | \sed -e 's/\(.*\)'"${rvm_gemset_separator:-"@"}"'.*/\1/')
+            rvm_gemset_name=$(echo $rvm_gemset_name | \sed -e 's/.*'"${rvm_gemset_separator:-"@"}"'\(.*\)/\1/')
 
             if [[ "${rvm_ruby_string:-""}" != "${rvm_gemset_name:-""}" ]] ; then
               rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator:-"@"}$rvm_gemset_name"
@@ -123,8 +123,8 @@ __rvm_parse_args()
           if [[ $# -gt 0 ]] ; then next_token="$1" ; shift ; else next_token="" ; fi
 
           if echo "$rvm_gemset_name" | \grep -q "${rvm_gemset_separator:-"@"}" ; then
-            rvm_ruby_string=$(echo "$rvm_gemset_name" | sed 's/\(.*\)'"${rvm_gemset_separator:-"@"}"'.*/\1/')
-            rvm_gemset_name=$(echo "$rvm_gemset_name" | sed 's/.*'"${rvm_gemset_separator:-"@"}"'\(.*\)/\1/')
+            rvm_ruby_string=$(echo "$rvm_gemset_name" | \sed 's/\(.*\)'"${rvm_gemset_separator:-"@"}"'.*/\1/')
+            rvm_gemset_name=$(echo "$rvm_gemset_name" | \sed 's/.*'"${rvm_gemset_separator:-"@"}"'\(.*\)/\1/')
 
             if [[ "$rvm_ruby_string" != "$rvm_gemset_name" ]] ; then
               rvm_ruby_string="$rvm_ruby_string${rvm_gemset_separator:-"@"}$rvm_gemset_name"
@@ -724,7 +724,7 @@ rvm()
 
         # Clear the gemset.
         if [[ ${rvm_delete_flag:-0} -eq 1 ]] ; then
-          gem_prefix="$(echo "${GEM_HOME:-""}" | sed 's/'${rvm_gemset_separator:-"@"}'.*$//')"
+          gem_prefix="$(echo "${GEM_HOME:-""}" | \sed 's/'${rvm_gemset_separator:-"@"}'.*$//')"
 
           if [[ "${GEM_HOME:-""}" = "${gem_prefix}${rvm_gemset_separator:-"@"}${rvm_gemset_name}" ]] ; then
             rvm_ruby_gem_home="$gem_prefix"

scripts/manage

@@ -340,7 +340,9 @@ __rvm_install_ruby()
           fi
 
         elif [[ "nightly" = "$rvm_ruby_version" ]] ; then
-          macruby_path="/Library/Frameworks/MacRuby.framework/Versions/0.8/usr/bin"
+          __rvm_db "macruby_nightly_version" "macruby_nightly_version"
+          macruby_path="/Library/Frameworks/MacRuby.framework/Versions/${macruby_nightly_version}/usr/bin"
+          unset macruby_nightly_version
           # TODO: Separated nightly from head.
 
           "$rvm_path/scripts/log" "info" "Retrieving the latest nightly macruby build..."

scripts/selector

@@ -63,8 +63,8 @@ __rvm_select()
       if [[ ${rvm_head_flag:-0} -eq 0 ]] ; then
         rvm_ruby_patch_level=${rvm_ruby_patch_level:-$(__rvm_db "rbx_patch_level")}
         rvm_ruby_string="${rvm_ruby_string/-prc/-rc}"
-        rvm_ruby_string="$(echo "$rvm_ruby_string" | sed 's#-p*#-#')"
-        rvm_ruby_package_file="$(echo "rubinius-${rvm_ruby_version}-${rvm_ruby_patch_level}.${rvm_archive_extension}" | sed 's#-p*#-#' )"
+        rvm_ruby_string="$(echo "$rvm_ruby_string" | \sed 's#-p*#-#')"
+        rvm_ruby_package_file="$(echo "rubinius-${rvm_ruby_version}-${rvm_ruby_patch_level}.${rvm_archive_extension}" | \sed 's#-p*#-#' )"
         __rvm_db "rbx_url" "rvm_ruby_url"
         rvm_ruby_url="$rvm_ruby_url/$rvm_ruby_package_file"
 
@@ -142,7 +142,7 @@ __rvm_select()
       rvm_ruby_version=${rvm_ruby_version:-"$(__rvm_db "ree_version")"}
 
       if [[ -n "${rvm_ruby_patch_level:-0}" ]] ; then
-        rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | sed 's#^p##')"
+        rvm_ruby_patch_level="$(echo $rvm_ruby_patch_level | \sed 's#^p##')"
       fi
 
       if [[ ${rvm_head_flag:-0} -eq 0 ]] ; then
@@ -391,7 +391,7 @@ __rvm_use()
 
       if [[ "system" != "$rvm_ruby_interpreter" ]] ; then
 
-        RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | sed 's#^\(.*\) (.*$#\1#')"
+        RUBY_VERSION="$("$rvm_ruby_home/bin/ruby" -v | \sed 's#^\(.*\) (.*$#\1#')"
 
         export GEM_HOME GEM_PATH MY_RUBY_HOME RUBY_VERSION
 

scripts/utility

@@ -146,14 +146,14 @@ __rvm_quote_args()
     if printf "%s" "$quoted_argument" | \grep -vq "^[[:alnum:]]$"; then
 
       quoted_string="$quoted_string '$(printf "%s" "$quoted_argument" \
-        | sed "s/'/\'\\\'\'/g")'"
+        | \sed "s/'/\'\\\'\'/g")'"
 
     else
       quoted_string="$quoted_string $quoted_argument"
     fi
   done
 
-  echo "$quoted_string" | sed -e 's/^ *//g' -e 's/ *$//g'
+  echo "$quoted_string" | \sed -e 's/^ *//g' -e 's/ *$//g'
 
   return 0
 }
@@ -658,7 +658,7 @@ __rvm_reset()
 
   files=(ruby gem rake irb $(cd "${rvm_bin_path:-"$rvm_path/bin"}" ; \
     find . -mindepth 1 -maxdepth 1 -iname 'default*' -type f \
-    | sed -e 's#./##g'))
+    | \sed -e 's#./##g'))
 
   for file in "${files[@]}"; do
 
@@ -1105,7 +1105,7 @@ __rvm_ensure_has_environment_files()
 # Strip whitespace and normalize it all.
 __rvm_strip()
 {
-  sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -e 's/[[:space:]]\{1,\}/ /g'
+  \sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' -e 's/[[:space:]]\{1,\}/ /g'
   return $?
 }
 
@@ -1513,7 +1513,7 @@ __rvm_expand_ruby_string()
         | awk -F"${rvm_gemset_separator:-"@"}" '{print $string}')"
 
       rvm_silence_logging=1 "$rvm_path/scripts/gemsets" list \
-        | sed "s/^/$current_ruby${rvm_gemset_separator:-"@"}/"
+        | \sed "s/^/$current_ruby${rvm_gemset_separator:-"@"}/"
       ;;
 
     current)