Revert ".shellrc: Avoid excessive spaces on completion"

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index b4b7a8191b737e0da5d9006c0e92f631ee65110e..9b8f6e9f0793fcbfe513f7ad24eb71e6461de8f5 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -95,12 +95,12 @@ if test -n "$BASH_VERSION"; then
 
    for cmd in builtin cgmem_nice command dbus-launch exec \
          killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \
-         run-all-hosts su sudo time whence whereis which xargs; do
+         run-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 \
+   for cmd in dig host mtr nslookup nc netcat nmap p ping ping6 \
+         ssh2 s2 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
@@ -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,6 +144,7 @@ if test -n "$BASH_VERSION"; then
 
    delegate_completion make m
    delegate_completion ping p
+   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
    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
@@ -346,13 +347,17 @@ mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
       if [ "`type -t short_curdir`" = function ]; then
-         OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
+         OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\`"
          if test -x /usr/bin/git >/dev/null 2>&1; then
-            OPS1+="\$(prompt_git)"
+            #if [ "`type -t __git_ps1`" = function ]; then
+            #   OPS1+="\$(__git_ps1)"
+            #else
+               OPS1+="\$(prompt_git)"
+            #fi
          fi
-         OPS1+="\\$\$SHLVL "
+         OPS1+=" \$SHLVL\\$ "
       else
-         OPS1="\u@\h:\W \\$"
+         OPS1="\u@\h:\W \$SHLVL\\$ "
       fi
    fi