X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.shellrc;h=8876507d44808c5d1e554b77df5f1449df804c28;hp=5200b80c9e7fce1628ee685361b726ffca04b7c3;hb=a629216aceda9afb4ec693e7318de2172e50ff93;hpb=8abda4557657577bb535dc52ffacab9aabbef3b5

diff --git a/.shellrc b/.shellrc
index 5200b80..8876507 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
@@ -73,55 +68,51 @@ if test -n "$BASH_VERSION"; then
 
    has_completion() { return 0; }
    if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
-      if [ "$SHELL" = /bin/bash ]; then
-         if [ -d /usr/share/bash-completion ]; then
-            . /usr/share/bash-completion/bash_completion
-            has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; }
-         elif [ -f /etc/bash_completion ]; then
-            . /etc/bash_completion
-            has_completion() { [ -r /etc/bash_completion.d/$1 ]; }
-         elif [ -d /etc/bash_completion.d ]; then
-            for _compf in /etc/bash_completion.d/*; do
-               . $_compf
-            done
-            has_completion() { [ -r /etc/bash_completion.d/$1 ]; }
-         fi
-      elif [ "$SHELL" = /usr/local/bin/bash ]; then
-         if [ -d /usr/local/etc/bash_completion.d ]; then
-            for _compf in /usr/local/etc/bash_completion.d/*; do
-               . $_compf
-            done
-            has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; }
-         fi
+      if [ -d /usr/share/bash-completion -a -r /usr/share/bash-completion/bash_completion ]; then
+         . /usr/share/bash-completion/bash_completion
+         has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; }
+      elif [ -r /etc/bash_completion ]; then
+         . /etc/bash_completion
+         has_completion() { [ -r /etc/bash_completion.d/$1 ]; }
+      elif [ -d /etc/bash_completion.d ]; then
+         for _compf in /etc/bash_completion.d/*; do
+            . $_compf
+         done
+         has_completion() { [ -r /etc/bash_completion.d/$1 ]; }
+      elif [ -d /usr/local/etc/bash_completion.d ]; then
+         for _compf in /usr/local/etc/bash_completion.d/*; do
+            . $_compf
+         done
+         has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; }
       else
          echo "Unknown OS type, cannot source bash_completion" >&2
       fi
    fi
 
-   if [ -d "$HOME"/.bash_completion.d ]; then
-      for _compf in "$HOME"/.bash_completion.d/*; do
-         . $_compf
-      done
-   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
+      for _compf in "$HOME"/.bash_completion.d/*; do
+         . $_compf
+      done
+   fi
+
    delegate_completion() {
       local prog programs
       prog=$1
@@ -154,6 +145,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"
@@ -164,7 +160,7 @@ if test -n "$BASH_VERSION"; then
    #   eval "`pyenv virtualenv-init -`"
    #fi
 
-   source virtualenvwrapper_lazy.sh 2>/dev/null
+   . virtualenvwrapper_lazy.sh 2>/dev/null
 
    if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; then
       . "$VIRTUAL_ENV/bin/activate"
@@ -180,6 +176,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 +335,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