umask 077
PATH="$HOME"/bin:"$HOME"/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+if [ -n "$DISPLAY" ]; then
+ PATH=$PATH:/usr/games
+fi
# Make `ssh host date` to display in 24-hour format
LANG=C
. "$HOME"/.shellrc
-# append to the history file, don't overwrite it
-shopt -s histappend
+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
# check the window size after each command and, if necessary,
# update the values of LINES and COLUMNS.
# match all files and zero or more directories and subdirectories.
#shopt -s globstar
+# append to the history file, don't overwrite it
+shopt -s histappend
+
[ "`type -t ls`" = alias ] && unalias ls
[ "`type -t ll`" = alias ] && unalias ll
functions() { typeset -f "$@"; }
j() { jobs; }
+if [ -r "$HOME"/admin/prog/bash_prompt ]; then
+ . "$HOME"/admin/prog/bash_prompt
+ set_prompt
+ unset set_prompt
+else
+ PS1="${debian_chroot:+($debian_chroot)}\u@\h:\W \$SHLVL\\$ "
+fi
+
if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
if [ -d /usr/share/bash-completion -a -r /usr/share/bash-completion/bash_completion ]; then
_BASH_COMPLETIONS_DIR=/usr/share/bash-completion/completions
programs="$@"
eval "_${prog}_completion_loader() {
_completion_loader $prog
- if [ x"$DELEGARE_NOSPACE" = x1 ]; then
+ if [ x"$DELEGATE_NOSPACE" = x1 ]; then
complete -o nospace -F _$prog $programs
else
complete -F _$prog $programs
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 python3.10
-DELEGARE_NOSPACE=1 delegate_completion rsync r rsync_cgmn rsync_cgmn_recode rsync_cgmn_recode2
+delegate_completion python python2.7 python3.4 python3.5 python3.6 python3.7 python3.8 python3.9 python3.10 python3.11
+DELEGATE_NOSPACE=1 delegate_completion rsync r rsync_cgmn rsync_cgmn_recode rsync_cgmn_recode2
delegate_completion ssh s
delegate_completion wget wget-m wget-wrapper ww
if type -p pip >/dev/null 2>&1 || type -p pip3 >/dev/null 2>&1; then
_pip_completion_loader() {
- eval "`pip$PY_VER completion --bash`"
- complete -F _pip_completion pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10
+ eval "`pip completion --bash`"
+ complete -F _pip_completion pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10 pip3.11
unset _pip_completion_loader
return 124
}
- complete -F _pip_completion_loader pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10
+ complete -F _pip_completion_loader pip pip2 pip2.7 pip3 pip3.4 pip3.5 pip3.6 pip3.7 pip3.8 pip3.9 pip3.10 pip3.11
+fi
+
+if test -d "$HOME"/.pyenv
+then
+ PYENV_ROOT="$HOME"/.pyenv
+ export PYENV_ROOT
+ PATH="$PYENV_ROOT/bin:$PATH"
+ if which pyenv >/dev/null 2>&1; then
+# eval "`pyenv init --path`"
+ eval "`pyenv init -`"
+ eval "`pyenv virtualenv-init -`"
+ fi
fi
-#if which pyenv >/dev/null 2>&1; then
-# eval "`pyenv init -`"
-# eval "`pyenv virtualenv-init -`"
-#fi
. virtualenvwrapper_lazy.sh 2>/dev/null
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
+ }
- if [ -n "$1" ]; then
- echo "Cannot find directory for remote $1" >&2
- echo "Usage: cdremote [remote_name]" >&2
- return 1
- fi
+ # 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
- 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
+ # 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
}
- if test -n "$BASH_VERSION"; then
- # 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
- }
+ complete -F _cdremote_complete cdremote
- # 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
- }
+ # 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 _cdremote_complete cdremote
+ complete -F _git_open_remote git-open-remote
+fi
- # 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_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
+
+ copy_function() {
+ test -n "$(declare -f "$1")" || return
+ eval "${_/$1/$2}"
+ }
+
+ rename_function() {
+ copy_function "$@" || return
+ unset -f "$1"
+ }
+
+ rename_function X _non_bash_X
+
+ X() { history -a; _non_bash_X; history -r; }
fi