X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.bashrc;h=7faeed5e6f76cc10c7d8aea5b17d79bff1a54103;hb=HEAD;hp=8797927ad530af6dbf163e195084448c5d4fb1a3;hpb=93b76535da2e506d91595ac1320b1f0eade85102;p=dotfiles.git

diff --git a/.bashrc b/.bashrc
index 8797927..8c05ad2 100644
--- a/.bashrc
+++ b/.bashrc
@@ -9,7 +9,11 @@
 # Copied from .profile to do minor initialization for non-interactive non-login-shells
 umask 077
 
-PATH="$HOME"/bin:"$HOME"/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+# Fix default PATH
+if [ "$PATH" = "/usr/local/bin:/usr/bin:/bin:/usr/games" ]; then
+    PATH="$HOME"/bin:"$HOME"/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+fi
+
 if [ -n "$DISPLAY" ]; then
     PATH=$PATH:/usr/games
 fi
@@ -28,10 +32,10 @@ esac
 
 . "$HOME"/.shellrc
 
+# This is the default value set by interactive bash
+# when the global value was unset. Unset it here too.
 if [ "$HISTFILE" = "$HOME/.bash_history" ]; then
     history -r
-    # This is the default value set by interactive bash
-    # when the global value was unset. Unset it here too.
     unset HISTFILE
 fi
 
@@ -143,8 +147,8 @@ DELEGATE_NOSPACE=1 delegate_completion rsync r rsync_cgmn rsync_cgmn_recode rsyn
 delegate_completion ssh s
 delegate_completion wget wget-m wget-wrapper ww
 
-if [ -d "$HOME"/.bash_completion.d -a \
-        -n "`ls -A $HOME/.bash_completion.d`" ]; then
+if [ -d "$HOME"/.bash_completion.d ] &&
+        [ -n "`ls -A $HOME/.bash_completion.d`" ]; then
     for _compf in "$HOME"/.bash_completion.d/*; do
         . $_compf
     done
@@ -157,11 +161,19 @@ if [ -d "$HOME/lib/config" ]; then
 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
+
+if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; 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
+
+. virtualenvwrapper_lazy.sh 2>/dev/null
+
+
 if test -d "$HOME"/.pyenv
 then
     PYENV_ROOT="$HOME"/.pyenv
@@ -175,144 +187,13 @@ then
 fi
 
 
-. virtualenvwrapper_lazy.sh 2>/dev/null
-
-if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; 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
-
-
-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 [ $# -gt 1 ]; then
-            echo "Usage: cdremote [remote_name]" >&2
-            return 1
-        fi
-
-        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
-            return
-        fi
-
-        if [ -n "$1" ]; then
-            echo "Cannot find directory for remote $1" >&2
-            echo "Usage: cdremote [remote_name]" >&2
-            return 1
-        fi
-
-        _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
-    }
-
-    # completion for `cd_worktree`
-
-    _cd_worktree_comp() {
-        local cur="${COMP_WORDS[COMP_CWORD]}"
-        COMPREPLY=(`compgen -W "$(
-            git worktree list | awk '{s=$3; gsub("[\\\\[\\\\]]", "", s); print s}'
-        )" -- "$cur"`)
-    }
-
-    _cd_worktree_comp_loader() {
-        _completion_loader git
-        unset _cd_worktree_comp_loader
-        complete -F _cd_worktree_comp cd_worktree
-        return 124
-    }
-
-    complete -F _cd_worktree_comp_loader cd_worktree
-
-    # completion for aliases in global .gitconfig
-
-    # fixup rbi rbia rbiap rbip - do refs name completion
-    _git_fixup() { __gitcomp_nl "$(__git_refs)" ; }
-    _git_rbi() { __gitcomp_nl "$(__git_refs)" ; }
-    _git_rbia() { __gitcomp_nl "$(__git_refs)" ; }
-    _git_rbiap() { __gitcomp_nl "$(__git_refs)" ; }
-    _git_rbip() { __gitcomp_nl "$(__git_refs)" ; }
-    #
-    # 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 [ $# -ne 1 ]; then
-            echo "Usage: _list_remotes remote_regexp" >&2
-            return 1
-        fi
-        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+=($remote)
-            fi
-        done
-    }
-
-    # completion for cdremote and git-open-remote - list remotes with a pattern
-    _list_remotes_completion() {
-        local cur="${COMP_WORDS[COMP_CWORD]}"
-        _list_remotes "$1"
-        COMPREPLY=(`compgen -W "${GIT_REMOTES[*]}" -- "$cur"`)
-        unset GIT_REMOTES
-    }
-
-    # completion for cdremote - list remotes with directories as URLs
-    _cdremote_complete() {
-        _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-remote - list remotes with http(s) URLs
-    _git_open_remote() {
-        _list_remotes_completion '^http\(s\)\?://'
-        if [ ${#COMPREPLY[*]} -eq 0 ]; then
-            _list_remotes_completion .
-        fi
+if test -x /usr/bin/screen >/dev/null 2>&1; then
+    screen_newwin() {
+        history -a
+        screen "$@"
     }
-
-    complete -F _git_open_remote git-open-remote
 fi
 
-
 if [ "$SHLVL" -eq 1 -a "`type -t X`" = function ] && which startx >/dev/null 2>&1; then
     # From https://stackoverflow.com/a/18839557
 
@@ -330,10 +211,3 @@ if [ "$SHLVL" -eq 1 -a "`type -t X`" = function ] && which startx >/dev/null 2>&
 
     X() { history -a; _non_bash_X; history -r; }
 fi
-
-if test -x /usr/bin/screen >/dev/null 2>&1; then
-    screen_newwin() {
-        history -a
-        screen "$@"
-    }
-fi