X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=.shellrc;h=4fc1021a2001733f22124f472a3bcb7ccc522bfe;hb=46d946faa8eba2e7bbbd24e3ff13162e8b6fa90b;hp=fd73f152065c9795cfab10fdfef5686b62d76f2d;hpb=d992db58d6cb4f4a2bb2218e3299511ebc629b6b;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index fd73f15..4fc1021 100644
--- a/.shellrc
+++ b/.shellrc
@@ -57,11 +57,6 @@ case "$HOME" in
    ;;
 esac
 
-
-OPS1="$OPS1\\$"
-PS1="$OPS1 "
-
-
 if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
    [ "`type -t ll`" = alias ] && unalias ll
@@ -99,21 +94,21 @@ if test -n "$BASH_VERSION"; then
    fi
 
    for cmd in builtin cgmem_nice command dbus-launch exec \
-      killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg su sudo \
-      time whence whereis which xargs; do
-         ! has_completion $cmd && complete -o default -A command $cmd
+         killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \
+         run-all-hosts su sudo time whence whereis which xargs; do
+      ! has_completion $cmd && complete -o default -A command $cmd
    done
 
    for cmd in dig host mtr nslookup nc netcat nmap p ping ping6 socat \
-      telnet t tt \
-      tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \
-      whois wd wget wget-download wget-m wget-wrapper ww; do
-         ! has_completion $cmd && complete -A hostname $cmd
+         telnet t tt \
+         tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \
+         whois wd wget wget-download wget-m wget-wrapper ww; do
+      ! has_completion $cmd && complete -A hostname $cmd
    done
 
    for cmd in distribute ftp lftp r rsync \
-      s scp ssh smbclient tcpdump tshark wireshark; do
-         ! has_completion $cmd && complete -o default -A hostname $cmd
+         s scp ssh smbclient tcpdump tshark wireshark; do
+      ! has_completion $cmd && complete -o default -A hostname $cmd
    done
 
    if [ -d "$HOME"/.bash_completion.d ]; then
@@ -154,6 +149,11 @@ if test -n "$BASH_VERSION"; then
    fi
    complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
 
+   if [ "`type -t short_curdir`" != function -a \
+         -r "$HOME"/admin/prog/bash_prompt ]; then
+      . "$HOME"/admin/prog/bash_prompt
+   fi
+
    #if type -p pip >/dev/null 2>&1; then
    #   eval "`pip completion --bash`"
    #   rm -rf /tmp/pip_build_"$USER"
@@ -180,6 +180,7 @@ elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    j() { jobs; }
 fi
 
+PS1="$OPS1"
 
 # clear screen and history, logout
 chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
@@ -338,7 +339,12 @@ include() {
 mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
-      OPS1="\u@\h "
+      if [ "`type -t short_curdir`" = function ]; then
+         OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
+         OPS1+="\$(prompt_git)\\$\$SHLVL "
+      else
+         OPS1="\u@\h:\W \\$"
+      fi
    fi
 
    if [ -n "$SLOWTERM" ]; then