Restructured how the - separator gets inserted in rvm-prompt to remove the need for sed editing at the end

Author: griff

binscripts/rvm-prompt

@@ -9,15 +9,9 @@ add()
 
   if [[ -n "$format" ]] ; then
 
-    if [[ ${previous_is_format_var:-0} = 1 ]] ; then
+    [[ ${previous_is_format_var:-0} = 1 ]] && eval "${token}_prefix_flag=1"
 
-      format="${format}-\$${token}"
-
-    else
-
-      format="${format}\$${token}"
-
-    fi
+    format="${format}\$${token}"
 
   else
 
@@ -113,12 +107,16 @@ if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
 
     interpreter=${strings[0]}
 
+    [[ ${interpreter_prefix_flag:-0} -gt 0 ]] && interpreter="-${interpreter}"
+
   fi
 
   if [[ ${version_flag:-0} -gt 0 || -n "$unicode_flag" ]] ; then
 
     version=${strings[1]}
 
+    [[ ${version_prefix_flag:-0} -gt 0 ]] && version="-${version}"
+
   fi
 
   if [[ ${#strings[@]} -gt 2 ]] ; then
@@ -127,6 +125,8 @@ if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
 
       patchlevel=${strings[2]}
 
+      [[ ${patchlevel_prefix_flag:-0} -gt 0 ]] && patchlevel="-${patchlevel}"
+
     fi
 
   fi
@@ -135,6 +135,8 @@ if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
 
     architecture="$(echo "$(ruby -v)" | sed 's/^.*\[//' | sed 's/\].*$//')"
 
+    [[ ${architecture_prefix_flag:-0} -gt 0 ]] && architecture="-${architecture}"
+
   fi
 
   if [[ ${gemset_flag:-0} -gt 0 ]] ; then
@@ -197,16 +199,11 @@ if [[ -n "$ruby" && -n "$(echo "$ruby" | awk '/rvm/{print}')" ]] ; then
 
     fi
 
-  fi
+    [[ ${unicode_prefix_flag:-0} -gt 0 ]] && unicode="-${unicode}"
 
-  eval "prompt=\"$format\""
-
-  echo "$prompt" \
-    | sed -e 's#^[[:space:]]*-*##g' \
-          -e 's#--*#-#g' \
-          -e 's#-*[[:space:]]*$##' \
-          -e 's#-'${rvm_gemset_separator:-"@"}'#'${rvm_gemset_separator:-"@"}'#'
+  fi
 
+  eval "echo \"$format\""
 
 else