.shellrc: Update completion

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index b4b7a8191b737e0da5d9006c0e92f631ee65110e..1db7013282a2242b6e94423491304ad2737c217e 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -99,8 +99,8 @@ if test -n "$BASH_VERSION"; then
       ! 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
@@ -346,11 +346,15 @@ 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 \\$"
       fi