themes/rjorgenson: Refactor rjorgenson theme to reduce subshells

- Removed several unnecessary branches
- Improved indentation
- No longer pipes grep output into awk

themes/rjorgenson/rjorgenson.theme.sh

@@ -15,87 +15,81 @@ SCM_GIT_CHAR="${STRING_COLOR}±${normal}"
 SCM_SVN_CHAR="${bold_cyan}⑆${normal}"
 SCM_HG_CHAR="${bold_red}☿${normal}"
 
+PROMPT_CHAR="${BRACKET_COLOR}➞ ${normal}"
+if [[ $OSTYPE =~ "darwin" ]]; then
+    PROMPT_CHAR="${BRACKET_COLOR}➞  ${normal}"
+fi
+
 #Mysql Prompt
 export MYSQL_PS1="(\u@\h) [\d]> "
 
+TITLEBAR=""
 case $TERM in
-        xterm*)
-        TITLEBAR="\[\033]0;\w\007\]"
-        ;;
-        *)
-        TITLEBAR=""
-        ;;
+    xterm*) TITLEBAR="\[\033]0;\w\007\]" ;;
 esac
 
-PS3=">> "
 
 __my_rvm_ruby_version() {
-    local gemset=$(echo $GEM_HOME | awk -F'@' '{print $2}')
-  [ "$gemset" != "" ] && gemset="@$gemset"
-    local version=$(echo $MY_RUBY_HOME | awk -F'-' '{print $2}')
-    local full="$version$gemset"
-  [ "$full" != "" ] && echo "${BRACKET_COLOR}[${STRING_COLOR}$full${BRACKET_COLOR}]${normal}"
+    local gemset ; gemset=$(echo "${GEM_HOME}" | awk -F'@' '{print $2}')
+    local version ; version=$(echo "${MY_RUBY_HOME}" | awk -F'-' '{print $2}')
+    [ "${gemset}" != "" ] && gemset="@${gemset}"
+    local full="${version}${gemset}"
+    [ "${full}" != "" ] && echo "${BRACKET_COLOR}[${STRING_COLOR}${full}${BRACKET_COLOR}]${normal}"
 }
 
 is_vim_shell() {
-        if [ ! -z "$VIMRUNTIME" ]
-        then
-                echo "${BRACKET_COLOR}[${STRING_COLOR}vim shell${BRACKET_COLOR}]${normal}"
-        fi
+    if [ ! -z "$VIMRUNTIME" ]
+    then
+        echo "${BRACKET_COLOR}[${STRING_COLOR}vim shell${BRACKET_COLOR}]${normal}"
+    fi
 }
 
-function is_integer() { # helper function for todo-txt-count
+function is_integer() { # helper function to make sure input is an integer
     [ "$1" -eq "$1" ] > /dev/null 2>&1
-        return $?
+    return $?
 }
 
+# XXX do we need/want to integrate with todo.sh? We don't provide it and I
+# can't find a version online that accepts ls as an input
 todo_txt_count() {
     if _omb_util_command_exists todo.sh; then # is todo.sh installed
-        count=$(todo.sh ls | egrep "TODO: [0-9]+ of ([0-9]+) tasks shown" | awk '{ print $4 }')
-        if is_integer $count; then # did we get a sane answer back
+        count=$(todo.sh ls \
+          | awk '/TODO: [0-9]+ of ([0-9]+) tasks shown/ { print $4 }')
+        if is_integer "${count}" ; then # did we get a sane answer back
             echo "${BRACKET_COLOR}[${STRING_COLOR}T:$count${BRACKET_COLOR}]$normal"
         fi
     fi
 }
 
 modern_scm_prompt() {
-        CHAR=$(scm_char)
-        if [ $CHAR = $SCM_NONE_CHAR ]
-        then
-                return
-        else
-                echo "${BRACKET_COLOR}[${CHAR}${BRACKET_COLOR}][${STRING_COLOR}$(scm_prompt_info)${BRACKET_COLOR}]$normal"
-        fi
-}
-
-my_prompt_char() {
-    if [[ $OSTYPE =~ "darwin" ]]; then
-        echo "${BRACKET_COLOR}➞  ${normal}"
-    else
-        echo "${BRACKET_COLOR}➞ ${normal}"
-    fi
+    CHAR=$(scm_char)
+    [ "${CHAR}" = "${SCM_NONE_CHAR}" ] \
+        || echo "${BRACKET_COLOR}[${CHAR}${BRACKET_COLOR}][${STRING_COLOR}$(scm_prompt_info)${BRACKET_COLOR}]$normal"
 }
 
 _omb_theme_PROMPT_COMMAND() {
+    my_host="${STRING_COLOR}\h${normal}";
+    my_user="${STRING_COLOR}\u${normal}";
+    my_path="${STRING_COLOR}\w${normal}";
 
-    my_ps_host="${STRING_COLOR}\h${normal}";
-    my_ps_user="${STRING_COLOR}\u${normal}";
-    my_ps_root="${bold_red}\u${normal}";
-    my_ps_path="${STRING_COLOR}\w${normal}";
-
+    line2="${BRACKET_COLOR}└─$(todo_txt_count)${PROMPT_CHAR}"
     # nice prompt
-    case "`id -u`" in
-        0) PS1="${TITLEBAR}${BRACKET_COLOR}┌─[$my_ps_root${BRACKET_COLOR}][$my_ps_host${BRACKET_COLOR}]$(modern_scm_prompt)$(__my_rvm_ruby_version)${BRACKET_COLOR}[${STRING_COLOR}\w${BRACKET_COLOR}]$(is_vim_shell)
-${BRACKET_COLOR}└─$(my_prompt_char)${normal}"
-        ;;
-        *) PS1="${TITLEBAR}${BRACKET_COLOR}┌─[$my_ps_user${BRACKET_COLOR}][$my_ps_host${BRACKET_COLOR}]$(modern_scm_prompt)$(__my_rvm_ruby_version)${BRACKET_COLOR}[${STRING_COLOR}\w${BRACKET_COLOR}]$(is_vim_shell)
-${BRACKET_COLOR}└─$(todo_txt_count)$(my_prompt_char)"
+    case "$(id -u)" in
+        0)
+          my_user="${bold_red}\u${normal}";
+          line2="${BRACKET_COLOR}└─${PROMPT_CHAR}"
         ;;
     esac
+
+    PS1="${TITLEBAR}"
+    PS1="${PS1}${BRACKET_COLOR}┌─[${my_user}${BRACKET_COLOR}][$my_host${BRACKET_COLOR}]"
+    PS1="${PS1}$(modern_scm_prompt)"
+    PS1="${PS1}$(__my_rvm_ruby_version)"
+    PS1="${PS1}${BRACKET_COLOR}[${my_path}${BRACKET_COLOR}]$(is_vim_shell)"
+    PS1="${PS1}\n${line2}"
 }
 
-PS2="└─$(my_prompt_char)"
-
-
+PS2="└─${PROMPT_CHAR}"
+PS3=">> "
 
 _omb_util_add_prompt_command _omb_theme_PROMPT_COMMAND