X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=67f9b762c91d7388eb23e8b99aa270b0996ec9dd;hb=956225f90ae9160de3b4f87041dc7979364114ba;hp=e348ff2e60ba6887f7c2734f8971ebbfb82d994f;hpb=50c68a6eb7312765ff12aa7d8c17e664fac98755;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index e348ff2..67f9b76 100644
--- a/.shellrc
+++ b/.shellrc
@@ -33,19 +33,35 @@ case "$SHELL" in
       fi
    fi
 
-   if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
-      complete -A command -o default man
+   has_completion() { return 0; }
+   if [ "$SHELL" = /bin/bash ]; then
+      if [ -d /etc/bash_completion.d -o -d /usr/share/bash-completion/completions ]; then
+         has_completion() { [ -r /etc/bash_completion.d/$1 -o -r /usr/share/bash-completion/completions/$1 ]; }
+      fi
+   elif [ "$SHELL" = /usr/local/bin/bash ]; then
+      if [ -d /usr/local/etc/bash_completion.d ]; then
+         has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; }
+      fi
    fi
 
-   complete -A command -o default builtin cgmem_nice command dbus-launch exec \
-      killall nice nohup pidof pidOf KillAll pgrep pkill psg pswg su sudo time \
-      whence whereis which xargs
-   complete -A hostname dig host nslookup nc netcat nmap p ping ping6 socat \
+   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
+   done
+
+   for cmd in dig host nslookup nc netcat nmap p ping ping6 socat \
       telnet t tt \
       tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \
-      whois wget wget-m wget-wrapper ww
-   complete -A hostname -o default distribute ftp lftp r rsync \
-      s scp ssh smbclient tcpdump tshark wireshark
+      whois wget 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;
+   done
+
    complete -A job bg fg j jobs wait
    complete -A variable unset
 
@@ -75,13 +91,13 @@ esac
 #PWd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)/...\/\2/"; }
 
 
-psg()  { ps auxw   | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; }
-pswg() { ps auxwww | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; }
+psg()   { ps auxw   | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; }
+pswg()  { ps auxwww | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; }
 
 # Like pgrep -f
 pidOf() { ps auxwww | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\|pidOf\|KillAll\)' | awk '{print $2}'; }
 
-# A kind of pkill
+# A kind of pkill/killall
 KillAll() {
    if [ -z "$2" ]; then
       kill `pidOf "$1"`
@@ -175,3 +191,16 @@ mc() {
    unset MC_FOUND MC_PWD_FILE MC_SAVE_TERM MC_SLOW MC_TMP_DIR MC_XTERM
    return $rc
 }
+
+
+tmux() {
+   case "$TERM" in
+      rxvt)
+         TERM=rxvt-unicode command tmux "$@"
+      ;;
+
+      *)
+         command tmux "$@"
+      ;;
+   esac
+}