X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.shellrc;h=1db7013282a2242b6e94423491304ad2737c217e;hp=0d043e6362d8040711dc32c61b003b85e868668b;hb=a1d086a56f5589110dcc6aff9ee0eabf1954f5e5;hpb=5147725299dae62526a9cb7e89222cd79339f149

diff --git a/.shellrc b/.shellrc
index 0d043e6..1db7013 100644
--- a/.shellrc
+++ b/.shellrc
@@ -9,11 +9,11 @@
 # If not running interactively, don't do anything
 case $- in
     *i*) ;;
-      *) return;;
+      *) return ;;
 esac
 
 # Stop if non-interactive shell
-# [ -z "$PS1" ] && return
+[ -z "$PS1" ] && return
 
 if test -n "$BASH_VERSION"; then
    # append to the history file, don't overwrite it
@@ -57,171 +57,209 @@ case "$HOME" in
    ;;
 esac
 
-
-OPS1="$OPS1\\$"
-PS1="$OPS1 "
-
-
 if test -n "$BASH_VERSION"; then
    [ "`type -t ls`" = alias ] && unalias ls
    [ "`type -t ll`" = alias ] && unalias ll
    [ "`type -t mc`" = alias ] && unalias mc
 
    back() { cd - "$@"; }
-   clo() { clear; logout; }
    functions() { typeset -f "$@"; }
    j() { jobs; }
 
    if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
-      if [ "$SHELL" = /bin/bash ]; then
-         if [ -f /etc/bash_completion ]; then
-            . /etc/bash_completion
-         elif [ -d /etc/bash_completion.d ]; then
-            . /etc/bash_completion.d/*
-         fi
-      elif [ "$SHELL" = /usr/local/bin/bash ]; then
-         if [ -d /usr/local/etc/bash_completion.d ]; then
-            . /usr/local/etc/bash_completion.d/*
-         fi
+      if [ -d /usr/share/bash-completion -a -r /usr/share/bash-completion/bash_completion ]; then
+         _BASH_COMPLETIONS_DIR=/usr/share/bash-completion/completions
+         . /usr/share/bash-completion/bash_completion
+      elif [ -r /etc/bash_completion ]; then
+         _BASH_COMPLETIONS_DIR=/etc/bash_completion.d
+         . /etc/bash_completion
+      elif [ -d /etc/bash_completion.d ]; then
+         _BASH_COMPLETIONS_DIR=/etc/bash_completion.d
+         for _compf in /etc/bash_completion.d/*; do
+            . $_compf
+         done
+      elif [ -d /usr/local/etc/bash_completion.d ]; then
+         _BASH_COMPLETIONS_DIR=/usr/local/etc/bash_completion.d
+         for _compf in /usr/local/etc/bash_completion.d/*; do
+            . $_compf
+         done
       else
-         echo "Unknown OS type, canot source bash_completion" >&2
+         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
+   has_completion() {
+      [ -n "$_BASH_COMPLETIONS_DIR" -a -d "$_BASH_COMPLETIONS_DIR" -a -r "$_BASH_COMPLETIONS_DIR/$1" ] ||
+      complete -p $1 >/dev/null 2>&1
+   }
 
    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
+         killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \
+         run-all-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 \
-      tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \
-      whois wget wget-m wget-wrapper ww; do
-         ! has_completion $cmd && complete -A hostname $cmd
+   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
    done
 
-   if has_completion wget; then
-      _wget_completion_loader() {
-         _completion_loader wget
-         complete -F _wget wget-m wget-wrapper ww
-         unset _wget_completion_loader
-         return 124
-      }
-      complete -F _wget_completion_loader wget-m wget-wrapper ww
-   fi
-
    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;
+         s scp ssh smbclient tcpdump tshark wireshark; do
+      ! has_completion $cmd && complete -o default -A hostname $cmd
    done
 
-   if has_completion rsync; then
-      _rsync_completion_loader() {
-         _completion_loader rsync
-         complete -F _rsync r
-         unset _rsync_completion_loader
-         return 124
-      }
-      complete -F _rsync_completion_loader r
-   fi
+   for cmd in bg fg jobs; do
+      ! has_completion $cmd && complete -A job $cmd
+   done
 
-   if has_completion ssh; then
-      _ssh_completion_loader() {
-         _completion_loader ssh
-         complete -F _ssh s
-         unset _ssh_completion_loader
-         return 124
-      }
-      complete -F _ssh_completion_loader s
+   complete -A job j wait
+
+   for cmd in unset; do
+      ! has_completion $cmd && complete -A variable -A function $cmd
+   done
+
+   if [ -d "$HOME"/.bash_completion.d ]; then
+      for _compf in "$HOME"/.bash_completion.d/*; do
+         . $_compf
+      done
    fi
 
-   if has_completion make; then
-      _make_completion_loader() {
-         _completion_loader make
-         complete -F _make m
-         unset _make_completion_loader
+   delegate_completion() {
+      local prog programs
+      prog=$1
+      ! has_completion $prog && return
+      shift
+      programs="$@"
+      eval "_${prog}_completion_loader() {
+         _completion_loader $prog
+         complete -o nospace -F _$prog $programs
+         unset _${prog}_completion_loader
          return 124
-      }
-      complete -F _make_completion_loader m
-   fi
+      }"
+      complete -F _${prog}_completion_loader $programs
+   }
 
-   unset has_completion
+   delegate_completion make m
+   delegate_completion ping p
+   delegate_completion rsync r rsync_cgmn rsync_cgmn_recode
+   delegate_completion ssh s
+   delegate_completion wget wget-m wget-wrapper ww
 
-   complete -A job bg fg j jobs wait
-   complete -A variable -A function unset
+   unset _BASH_COMPLETIONS_DIR has_completion delegate_completion
 
    if [ -d "$HOME/lib/config" ]; then
       complete -W "`cd \"$HOME/lib/config\" && echo *`" include
    fi
    complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
 
+   if [ "`type -t short_curdir`" != function -a \
+         -r "$HOME"/admin/prog/bash_prompt ]; then
+      . "$HOME"/admin/prog/bash_prompt
+   fi
+
    #if type -p pip >/dev/null 2>&1; then
    #   eval "`pip completion --bash`"
    #   rm -rf /tmp/pip_build_"$USER"
    #fi
 
-elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
-   back() { cd - "$@"; }
-   clo() { clear; exit; }
-   j() { jobs; }
+   #if which pyenv >/dev/null 2>&1; then
+   #   eval "`pyenv init -`"
+   #   eval "`pyenv virtualenv-init -`"
+   #fi
 
-else
-   clo() { clear; exit; }
-fi
+   . virtualenvwrapper_lazy.sh 2>/dev/null
 
+   if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; then
+      . "$VIRTUAL_ENV/bin/activate"
+   fi
 
-# clear history, clear screen and logout
-#chlo() { cd; unset HISTFILE; rm -f .sh_history; history -c; clo; }
+   # Clean up python virtual environment on exit
+   # See https://virtualenvwrapper.readthedocs.io/en/latest/tips.html#clean-up-environments-on-exit
 
+   trap '[ "$VIRTUAL_ENV" ] && deactivate' EXIT
 
-#Pwd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)\/\(.*\)\/\(.*\)/...\/\2\/\3\/\4/"; }
-#PWd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)/...\/\2/"; }
+elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
+   back() { cd - "$@"; }
+   j() { jobs; }
+fi
 
+PS1="$OPS1"
 
-psg()   { ps auxw   | grep -i "$@" | grep -v '\(ps auxw\|grep\)'; }
-pswg()  { ps auxwww | grep -i "$@" | grep -v '\(ps auxw\|grep\)'; }
+# clear screen and history, logout
+chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
 
-# Like pgrep -f
-pidOf() { ps auxwww | grep -i "$@" | grep -v '\(ps auxw\|grep\|pidOf\|KillAll\)' | awk '{print $2}'; }
 
-# A kind of pkill/killall
-KillAll() {
-   if [ -z "$1" -o -n "$3" ]; then
-      echo "Usage: KillAll [-signal] proc_regexp" >&2
-      return 1
-   fi
-   if [ -z "$2" ]; then
-      kill `pidOf "$1"`
-   else
-      kill "$1" `pidOf "$2"`
-   fi
-}
+if test -x /usr/bin/git >/dev/null 2>&1; then
+   # chdir to a directory
+   cdgitpath() {
+      if [ $# -ne 1 ]; then
+         echo "Usage: cdgitpath path_key" >&2
+         return 1
+      fi
 
+      path_key="$1"
+      if [ -z "$path_key" ]; then
+         echo "Usage: cdgitpath path_key" >&2
+         return 1
+      fi
+
+      path_url="`git config --get --path $path_key`"
+      if echo "$path_url" | grep -q '^file:/'; then
+         path_url="`echo \"$path_url\" | sed 's@^file:/\+@/@'`"
+      fi
+      cd "$path_url"
+   }
 
-if test -x /usr/bin/git >/dev/null 2>&1; then
    # chdir to a remote's directory (if the remote is on the local FS)
    cdremote() {
-      if [ -z "$1" -o -n "$2" ]; then
-         echo "Usage: cdremote remote_name" >&2
+      if [ $# -gt 1 ]; then
+         echo "Usage: cdremote [remote_name]" >&2
          return 1
       fi
-      cd "`git config --get remote.$1.url`"
+
+      if [ -z "$1" ]; then
+         branch="`git rev-parse --abbrev-ref HEAD`"
+         remote="`git config --get branch.$branch.remote`"
+      else
+         remote="$1"
+      fi
+
+      if [ -n "$remote" ] && git config --get remote.$remote.url |
+            grep -q '^\(file:/\|/\|\.\./\)'; then # (file:/ or / or ../ at the beginning)
+         cdgitpath remote.$remote.url
+      else
+
+         if [ -n "$1" ]; then
+            echo "Cannot find directory for remote $1" >&2
+            echo "Usage: cdremote [remote_name]" >&2
+            return 1
+         fi
+
+         if test -n "$BASH_VERSION"; then
+            _list_remotes '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
+            if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
+               remote=${GIT_REMOTES[0]}
+               unset GIT_REMOTES
+               cdgitpath remote.$remote.url
+            else
+               unset GIT_REMOTES
+               echo "Cannot find directory for any remote" >&2
+               echo "Usage: cdremote [remote_name]" >&2
+               return 1
+            fi
+         else
+            echo "Cannot find directory for remote $1" >&2
+            echo "Usage: cdremote [remote_name]" >&2
+            return 1
+         fi
+      fi
    }
 
    if test -n "$BASH_VERSION"; then
-      # completion for global aliases in .gitconfig
+      # completion for aliases in global .gitconfig
 
       # fixup rbi rbia rbiap rbip - do refs name completion
       _git_fixup() { __gitcomp_nl "$(__git_refs)" ; }
@@ -233,42 +271,59 @@ 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() {
+         local cur="${COMP_WORDS[COMP_CWORD]}"
+         COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`)
+      }
+
+      _git_open() {
+         _cdgitpath_complete
+      }
+
+      complete -F _cdgitpath_complete cdgitpath git-open
+
       # list remotes with URLs matching a regexp
       _list_remotes() {
-         if [ -z "$1" -o -n "$2" ]; then
+         if [ $# -ne 1 ]; then
             echo "Usage: _list_remotes remote_regexp" >&2
             return 1
          fi
-         GIT_REMOTES=""
+         declare -ag GIT_REMOTES=()
          local remote
          for remote in `git remote`; do
             if git config --get remote.$remote.url | grep -q "$1"; then
-               GIT_REMOTES="$GIT_REMOTES $remote"
+               GIT_REMOTES+=($remote)
             fi
          done
       }
 
-      # completion for cdremote and git-open - list remotes with a pattern
+      # completion for cdremote and git-open-remote - list remotes with a pattern
       _list_remotes_completion() {
-         local cur="${COMP_WORDS[COMP_CWORD]}";
+         local cur="${COMP_WORDS[COMP_CWORD]}"
          _list_remotes "$1"
-         COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
+         COMPREPLY=(`compgen -W "${GIT_REMOTES[*]}" -- "$cur"`)
          unset GIT_REMOTES
       }
 
       # completion for cdremote - list remotes with directories as URLs
       _cdremote_complete() {
-         _list_remotes_completion '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+         _list_remotes_completion '^\(file:/\|/\|\.\./\)' # (file:/ or / or ../ at the beginning)
+         if [ ${#COMPREPLY[*]} -eq 0 ]; then
+            _list_remotes_completion .
+         fi
       }
 
       complete -F _cdremote_complete cdremote
 
-      # completion for git-open - list remotes with http(s) URLs
-      _git_open() {
+      # completion for git-open-remote - list remotes with http(s) URLs
+      _git_open_remote() {
          _list_remotes_completion '^http\(s\)\?://'
+         if [ ${#COMPREPLY[*]} -eq 0 ]; then
+            _list_remotes_completion .
+         fi
       }
 
-      complete -F _git_open git-open
+      complete -F _git_open_remote git-open-remote
    fi
 fi
 
@@ -290,7 +345,19 @@ include() {
 mc() {
    if test -n "$BASH_VERSION"; then
       MC_SAVE_OPS1="$OPS1"
-      OPS1="\u@\h "
+      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
+               OPS1+="\$(prompt_git)"
+            fi
+         fi
+         OPS1+=" \\$\$SHLVL "
+      else
+         OPS1="\u@\h:\W \\$"
+      fi
    fi
 
    if [ -n "$SLOWTERM" ]; then
@@ -299,10 +366,6 @@ mc() {
 
    case "$TERM" in
       screen*) # screen, screen.rxvt
-         if [ "$TERM" = screen.rxvt ]; then
-            MC_SAVE_TERM="$TERM"
-            TERM=rxvt
-         fi
          MC_XTERM="-x"
       ;;
    esac
@@ -354,9 +417,7 @@ mc() {
    fi
 
    [ -n "$MC_SAVE_OPS1" ] && OPS1="$MC_SAVE_OPS1"
-   [ -n "$MC_SAVE_TERM" ] && TERM="$MC_SAVE_TERM"
-   unset MC_FOUND MC_PWD_FILE MC_SAVE_OPS1 MC_SAVE_TERM \
-         MC_SLOW MC_TMP_DIR MC_XTERM
+   unset MC_FOUND MC_PWD_FILE MC_SAVE_OPS1 MC_SLOW MC_TMP_DIR MC_XTERM
 
    return $rc
 }
@@ -390,18 +451,8 @@ if which tmux >/dev/null 2>&1; then
 fi
 
 
-#if which pyenv >/dev/null 2>&1; then
-#   eval "`pyenv init -`"
-#   eval "`pyenv virtualenv-init -`"
-#fi
-
-if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then
-   source /usr/local/bin/virtualenvwrapper_lazy.sh
-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; }