.shellrc: Improve `cdremote`

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index ff089415d0369a3b135b17ab5f2a73b133d22327..9a484c15d96f836e0362a4004b71128e7e81dfda 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -98,6 +98,12 @@ if test -n "$BASH_VERSION"; then
       fi
    fi
 
+   if [ -d "$HOME"/.bash_completion.d ]; then
+      for _compf in "$HOME"/.bash_completion.d/*; do
+         . $_compf
+      done
+   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
@@ -134,7 +140,7 @@ if test -n "$BASH_VERSION"; then
 
    delegate_completion make m
    delegate_completion ping p
-   delegate_completion rsync r
+   delegate_completion rsync r rsync_cgmn rsync_cgmn_recode
    delegate_completion ssh s
    delegate_completion wget wget-m wget-wrapper ww
 
@@ -164,6 +170,11 @@ if test -n "$BASH_VERSION"; then
       . "$VIRTUAL_ENV/bin/activate"
    fi
 
+   # 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
+
 elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    back() { cd - "$@"; }
    j() { jobs; }
@@ -210,7 +221,27 @@ if test -x /usr/bin/git >/dev/null 2>&1; then
          return 1
       fi
 
-      cdgitpath remote.$remote.url
+      if git config --get remote.$remote.url | grep -q '^\(/\|\.\./\)'; then
+         cdgitpath remote.$remote.url
+      else
+
+         local GIT_REMOTES remote
+         GIT_REMOTES=""
+         for remote in `git remote`; do
+            if git config --get remote.$remote.url | grep -q '^\(/\|\.\./\)'; then
+               GIT_REMOTES="$GIT_REMOTES $remote"
+            fi
+         done
+         GIT_REMOTES=($GIT_REMOTES)
+         if [ ${#GIT_REMOTES[*]} -eq 1 ]; then
+            remote=${GIT_REMOTES[0]}
+            cdgitpath remote.$remote.url
+         else
+            echo "Cannot find directory for any remote" >&2
+            echo "Usage: cdremote [remote_name]" >&2
+            return 1
+         fi
+      fi
    }
 
    if test -n "$BASH_VERSION"; then
@@ -316,10 +347,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
@@ -371,9 +398,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
 }