Clean up bashrc system

 *  Remove excess comments and optional syntax (eg. EOL `;`),

 *  use non-conflict function names,

 *  simplify PS1 generation,

 *  close PROMPT_COMMAND setup into function,

dotfiles/bash/defaults.bashrc

@@ -5,10 +5,10 @@
 # defaults to be overriden in host/hostname.bashrc and user/username.bashrc
 #
 
-make_ps1u() {
+__bashum__mkps1user() {
     echo "";
 }
 
-make_ps1h() {
+__bashum__mkps1host() {
     echo "$blue\h$normal";
 }

dotfiles/bash/post.bashrc

@@ -4,11 +4,7 @@
 ### things to do AFTER host/user-specific settings ###
 ######################################################
 
-### .... ###
-### BASH ###
-### '''' ###
-
-__make_ps1d() {
+__bashum__lastrv() {
     local rvfile="$RV_TMP/$$.lastrv"
     local lastrv="$(cat "$rvfile")"
     local do_rm=false
@@ -22,69 +18,75 @@ __make_ps1d() {
     $do_rm && rm -f "$rvfile"
 }
 
-__save_rv() {
+__bashum__save_rv() {
     local rvfile="$RV_TMP/$$.lastrv"
     [ -w "${rvfile%/*}" ] && echo "$1" > "$rvfile"
 }
 
-make_ps1() {
+__bashum__mkps1() {
     # these functions must be already defined by ~/.bash/user/*.bashrc
     # and ~/.bash/host/*.bashrc
-    test -n "$SSH_CONNECTION" && local ps1u=$(make_ps1u)
-    local ps1h=$(make_ps1h)
-    local ps1w="$lblue\w$normal";
-    local ps1G='$(__git_ps1 "(%s)")';
-    local ps1g="$green$ps1G$normal";
-    local ps1D='$(__make_ps1d -r)';
-    local ps1d="$lred$ps1D$normal";
-    echo "$ps1u$lwhite@$ps1h:$ps1w$ps1g$ps1d\$ ";
+    test -n "$SSH_CONNECTION" \
+     && echo -n "$(__bashum__mkps1user)"    # username only when on ssh
+    echo -n "$lwhite@"                      # nice shiny at sign
+    echo -n "$(__bashum__mkps1host):"       # hostname colored per host
+    echo -n "$lblue\w$normal"               # current workdir
+    echo -n "$green"                        #\
+    echo -n     '$(__git_ps1 "(%s)")'       # > git's PS1
+    echo -n "$normal"                       #/
+    echo -n "$lred"                         #\
+    echo -n     '$(__bashum__lastrv -r)'    # > last exit status (nothing if zero)
+    echo -n "$normal"                       #/
+    echo '$ '                               # obligatory dollar
 }
 
-make_ps2() {
-    echo "$white>$yellow>$lyellow>$normal ";
+__bashum__mkps2() {
+    echo "$white>$yellow>$lyellow>$normal "
 }
 
 # and use to assemble own PS1
-export PS1=$(make_ps1)
-export PS2=$(make_ps2)
+export PS1=$(__bashum__mkps1)
+export PS2=$(__bashum__mkps2)
+
 
-### ...... ###
-### OTHERS ###
-### '''''' ###
+__bashum__setup_prompt_command() {
 
-case "$TERM" in
+    case "$TERM" in
 
-    xterm*|rxvt*|screen*)
-        test -n "$SSH_CONNECTION" \
-         && __host_id="${HOSTNAME%%.*}:"      # i.e. a remote session
-        PROMPT_COMMAND='__save_rv $?; echo -ne "\033]0;$(__make_ps1d)$__host_id${PWD/$HOME/\~}\$\007"'
+        xterm*|rxvt*|screen*)
+            test -n "$SSH_CONNECTION" \
+             && __host_id="${HOSTNAME%%.*}:"      # i.e. a remote session
+            PROMPT_COMMAND='__bashum__save_rv $?; echo -ne "\033]0;$(__bashum__lastrv)$__host_id${PWD/$HOME/\~}\$\007"'
 
-        # Show the currently running command in the terminal title:
-        # http://www.davidpashley.com/articles/xterm-titles-with-bash.html
-        show_command_in_title_bar()
-        {
-            case "$BASH_COMMAND" in
-                *\033]0*)
-                    # The command is trying to set the title bar as well;
-                    # this is most likely the execution of $PROMPT_COMMAND.
-                    # In any case nested escapes confuse the terminal, so don't
-                    # output them.
-                    ;;
-                "")
-                    echo -ne "\033]0;$(__make_ps1d)$__host_id${PWD/$HOME/\~}\$\007"
-                    ;;
-                *)
-                    echo -ne "\033]0;${BASH_COMMAND} ($__host_id${PWD/$HOME/\~})\007"
-                    ;;
-            esac
-        }
-        trap show_command_in_title_bar DEBUG
-        ;;
+            # Show the currently running command in the terminal title:
+            # http://www.davidpashley.com/articles/xterm-titles-with-bash.html
+            show_command_in_title_bar()
+            {
+                case "$BASH_COMMAND" in
+                    *\033]0*)
+                        # The command is trying to set the title bar as well;
+                        # this is most likely the execution of $PROMPT_COMMAND.
+                        # In any case nested escapes confuse the terminal, so don't
+                        # output them.
+                        ;;
+                    "")
+                        echo -ne "\033]0;$(__bashum__lastrv)$__host_id${PWD/$HOME/\~}\$\007"
+                        ;;
+                    *)
+                        echo -ne "\033]0;${BASH_COMMAND} ($__host_id${PWD/$HOME/\~})\007"
+                        ;;
+                esac
+            }
+            trap show_command_in_title_bar DEBUG
+            ;;
 
-    *)
-        PROMPT_COMMAND='__save_rv $?;'
-        ;;
+        *)
+            PROMPT_COMMAND='__bashum__save_rv $?;'
+            ;;
+
+    esac
+}
 
-esac
+__bashum__setup_prompt_command
 
 tasknag