Revamp loading of .bash/ RC files

*   More intuitive file naming,
*   setup simplified,
*   setup is now in script (vs. diff file),
*   removed unnecessary exec mode.

dotfiles/bash/head.bashrc

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+for include in \
+  "${HOME}/.bash/colors.bashrc" \
+  "${HOME}/.bash/main.bashrc" \
+  "${HOME}/.bash/user/$(whoami).bashrc" \
+  "${HOME}/.bash/host/$(hostname).bashrc" \
+  "${HOME}/.bash/post.bashrc";
+do
+  test -f $include && . $include;
+done

dotfiles/bash/global-after.bashrc → dotfiles/bash/post.bashrc

@@ -9,7 +9,6 @@
 ### '''' ###
 
 make_ps1() {
-    source "${HOME}/.bash/colors"
     # these functions must be already defined by ~/.bash/user/*.bashrc
     # and ~/.bash/host/*.bashrc
     ps1u=$(make_ps1u)
@@ -21,7 +20,6 @@ make_ps1() {
 }
 
 make_ps2() {
-    source "${HOME}/.bash/colors"
     echo "$white>$yellow>$lyellow>$normal ";
 }
 

dotfiles/bash/setup

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+put() {
+    echo "$1" >> $HOME/.bashrc
+}
+
+mark="# added by https://github.com/AloisMahdal/mydots"
+if grep -qF "$mark" $HOME/.bashrc;
+then
+    echo "already set up, giving up";
+    exit 1;
+else
+    put ''
+    put '# added by https://github.com/AloisMahdal/mydots"'
+    put 'test -f "${HOME}/.bash/head.bashrc" \'
+    put '  &&. "${HOME}/.bash/head.bashrc"'
+fi

dotfiles/bash/setup/bashrc.diff

@@ -1,22 +0,0 @@
---- /etc/skel/.bashrc	2012-07-13 01:31:07.000000000 +0200
-+++ .bashrc	2013-04-13 15:48:06.950935705 +0200
-@@ -108,3 +108,19 @@
-     . /etc/bash_completion
-   fi
- fi
-+
-+if [ -x "${HOME}/.bash/global-before.bashrc" ]; then
-+    source "${HOME}/.bash/global-before.bashrc";
-+fi
-+
-+if [ -x "${HOME}/.bash/user/$(whoami).bashrc" ]; then
-+    source "${HOME}/.bash/user/$(whoami).bashrc";
-+fi
-+
-+if [ -x "${HOME}/.bash/host/$(hostname -s).bashrc" ]; then
-+    source "${HOME}/.bash/host/$(hostname -s).bashrc";
-+fi
-+
-+if [ -x "${HOME}/.bash/global-after.bashrc" ]; then
-+    source "${HOME}/.bash/global-after.bashrc";
-+fi