X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=.shellrc;h=ee7f78e3da6ca6aa2bfcbc062ae3d1a3a6649522;hb=f2a3133673fae936bea5377bc385a7d8ea7f74c6;hp=92f6585c216cb7347728c31afe81e53efe890eff;hpb=93929f8d9061fe4075ec2c4aa155649c71acc9a0;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 92f6585..ee7f78e 100644
--- a/.shellrc
+++ b/.shellrc
@@ -118,7 +118,7 @@ if test -n "$BASH_VERSION"; then
    complete -A job j wait
 
    for cmd in unset; do
-      ! has_completion $cmd && complete -A variable -A function $cmd
+      ! has_completion $cmd && complete -A function -A variable $cmd
    done
 
    if [ -d "$HOME"/.bash_completion.d ]; then
@@ -135,7 +135,7 @@ if test -n "$BASH_VERSION"; then
       programs="$@"
       eval "_${prog}_completion_loader() {
          _completion_loader $prog
-         complete -o nospace -F _$prog $programs
+         complete -F _$prog $programs
          unset _${prog}_completion_loader
          return 124
       }"
@@ -144,7 +144,8 @@ if test -n "$BASH_VERSION"; then
 
    delegate_completion make m
    delegate_completion ping p
-   delegate_completion rsync r rsync_cgmn rsync_cgmn_recode
+   delegate_completion python python2.7 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9
+   delegate_completion rsync r rsync_cgmn rsync_cgmn_recode rsync_cgmn_recode2
    delegate_completion ssh s
    delegate_completion wget wget-m wget-wrapper ww
 
@@ -162,7 +163,6 @@ if test -n "$BASH_VERSION"; then
 
    #if type -p pip >/dev/null 2>&1; then
    #   eval "`pip completion --bash`"
-   #   rm -rf /tmp/pip_build_"$USER"
    #fi
 
    #if which pyenv >/dev/null 2>&1; then
@@ -330,12 +330,13 @@ fi
 
 include() {
    cfg="$1"
+   shift
    if [ -f "./$cfg" -a -r "./$cfg" ]; then
       echo "Reading config file \`$cfg'" 1>&2
-      . "./$cfg"
+      . "./$cfg" "$@"
    elif [ -f "$HOME/lib/config/$cfg" -a -r "$HOME/lib/config/$cfg" ]; then
       echo "Reading config file \`$HOME/lib/config/$cfg'" 1>&2
-      . "$HOME/lib/config/$cfg"
+      . "$HOME/lib/config/$cfg" "$@"
    else
       echo "Cannot find config file \`$cfg'" 1>&2
    fi
@@ -348,11 +349,11 @@ mc() {
       if [ "`type -t short_curdir`" = function ]; then
          OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
          if test -x /usr/bin/git >/dev/null 2>&1; then
-            if [ "`type -t __git_ps1`" = function ]; then
-               OPS1+="\$(__git_ps1)"
-            else
+            #if [ "`type -t __git_ps1`" = function ]; then
+            #   OPS1+="\$(__git_ps1)"
+            #else
                OPS1+="\$(prompt_git)"
-            fi
+            #fi
          fi
          OPS1+=" \$SHLVL\\$ "
       else