.shellrc: Complete program names for `run-all-hosts`

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index 56051caf9037a6da929c2c19f94619e117e0aeee..4fc1021a2001733f22124f472a3bcb7ccc522bfe 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -57,7 +57,6 @@ case "$HOME" in
    ;;
 esac
 
-
 if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
    [ "`type -t ll`" = alias ] && unalias ll
@@ -95,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
@@ -155,8 +154,6 @@ if test -n "$BASH_VERSION"; then
       . "$HOME"/admin/prog/bash_prompt
    fi
 
-   PS1="\`cgmem_which_prompt\`$OPS1$SHLVL "
-
    #if type -p pip >/dev/null 2>&1; then
    #   eval "`pip completion --bash`"
    #   rm -rf /tmp/pip_build_"$USER"
@@ -183,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; }
@@ -342,9 +340,10 @@ mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
       if [ "`type -t short_curdir`" = function ]; then
-         OPS1="\u@\${HOSTNAME::5} \`short_curdir\` \\$"
+         OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
+         OPS1+="\$(prompt_git)\\$\$SHLVL "
       else
-         OPS1="\u@\h \W \\$"
+         OPS1="\u@\h:\W \\$"
       fi
    fi