X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=38d9dcc2f54b85d95f335dde0141979497a402d8;hb=171941f5107d46317e3487d611e60c59054b7782;hp=aef34517a6a4f9b6bba036f0479f3a5a5fe47f01;hpb=a176b6b17c8e7fafdaa627f5fa5024be7f18f67e;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index aef3451..38d9dcc 100644
--- a/.shellrc
+++ b/.shellrc
@@ -57,17 +57,6 @@ case "$HOME" in
    ;;
 esac
 
-
-# Remove trainling \$s
-OPS1="`echo $OPS1 | sed 's/[ \\$]\+$//'`"
-# Add a trainling space
-OPS1="$OPS1 "
-# Re-add trainling \$
-for ((i=0; i<$SHLVL; i++)); do OPS1="$OPS1\\$"; done
-
-PS1="$OPS1 "
-
-
 if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
    [ "`type -t ll`" = alias ] && unalias ll
@@ -105,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 \
+         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
@@ -160,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"
@@ -186,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; }
@@ -344,7 +339,12 @@ include() {
 mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
-      OPS1="\u@\h \W "
+      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