Feat(bash-prompt): Switch back to `prompt_git`

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index a5f78d44225b8b0939f169d140113b024d9ceeff..922702d1b4be30505447b702b5999bea172a2d0e 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -95,7 +95,7 @@ if test -n "$BASH_VERSION"; then
 
    for cmd in builtin cgmem_nice command dbus-launch exec \
          killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \
-         run-all-hosts su sudo time whence whereis which xargs; do
+         run-hosts su sudo time whence whereis which xargs; do
       ! has_completion $cmd && complete -o default -A command $cmd
    done
 
@@ -118,7 +118,7 @@ if test -n "$BASH_VERSION"; then
    complete -A job j wait
 
    for cmd in unset; do
-      ! has_completion $cmd && complete -A variable -A function $cmd
+      ! has_completion $cmd && complete -A function -A variable $cmd
    done
 
    if [ -d "$HOME"/.bash_completion.d ]; then
@@ -330,12 +330,13 @@ fi
 
 include() {
    cfg="$1"
+   shift
    if [ -f "./$cfg" -a -r "./$cfg" ]; then
       echo "Reading config file \`$cfg'" 1>&2
-      . "./$cfg"
+      . "./$cfg" "$@"
    elif [ -f "$HOME/lib/config/$cfg" -a -r "$HOME/lib/config/$cfg" ]; then
       echo "Reading config file \`$HOME/lib/config/$cfg'" 1>&2
-      . "$HOME/lib/config/$cfg"
+      . "$HOME/lib/config/$cfg" "$@"
    else
       echo "Cannot find config file \`$cfg'" 1>&2
    fi
@@ -348,11 +349,11 @@ mc() {
       if [ "`type -t short_curdir`" = function ]; then
          OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
          if test -x /usr/bin/git >/dev/null 2>&1; then
-            if [ "`type -t __git_ps1`" = function ]; then
-               OPS1+="\$(__git_ps1)"
-            else
+            #if [ "`type -t __git_ps1`" = function ]; then
+            #   OPS1+="\$(__git_ps1)"
+            #else
                OPS1+="\$(prompt_git)"
-            fi
+            #fi
          fi
          OPS1+=" \$SHLVL\\$ "
       else