X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=ff089415d0369a3b135b17ab5f2a73b133d22327;hb=43f1c1115d4bf42ce69852a9514dc351264524fd;hp=14eb24d659bba34825a1f8f620b2096bec51ced8;hpb=3f75c1df72d8920fde8b4012af8201268985c33a;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 14eb24d..ff08941 100644
--- a/.shellrc
+++ b/.shellrc
@@ -71,37 +71,33 @@ if test -n "$BASH_VERSION"; then
    functions() { typeset -f "$@"; }
    j() { jobs; }
 
+   has_completion() { return 0; }
    if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
       if [ "$SHELL" = /bin/bash ]; then
-         if [ -f /etc/bash_completion ]; 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
       else
          echo "Unknown OS type, cannot source bash_completion" >&2
       fi
    fi
 
-   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
-
    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
@@ -230,10 +226,10 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
       # push-to-all-remotes - do branch name completion
       _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; }
 
-      _cdgitpath_complete_loader() {
+      _cdgitpath_completion_loader() {
          _completion_loader git
          complete -F _cdgitpath_complete cdgitpath git-open
-         unset _cdgitpath_complete_loader
+         unset _cdgitpath_completion_loader
          return 124
       }
 
@@ -246,7 +242,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          _cdgitpath_complete
       }
 
-      complete -F _cdgitpath_complete_loader cdgitpath git-open
+      complete -F _cdgitpath_completion_loader cdgitpath git-open
 
       # list remotes with URLs matching a regexp
       _list_remotes() {
@@ -412,7 +408,7 @@ fi
 
 
 if [ "$SHLVL" -eq 1 ] && which startx >/dev/null 2>&1; then
-   X() { startx >> .Xserver.log 2>&1; cyr; }
+   X() { startx >> .Xserver.log 2>&1; cyr; rm -f .Xauthority; }
 fi
 
 x() { exit; }