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

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 167af7b5c4e4cf95101a977adf42d585f468228c..922702d1b4be30505447b702b5999bea172a2d0e 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -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