X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=.bashrc;h=3255cb6d6892ad96e983e1b4674267dd501c840a;hb=a76afb2b4578dc34da0abd6d61c54a9345800f5e;hp=c1d88ed8a3dd4ef90afbb9a693c923acc28c81bd;hpb=a8f2d98db8d69e9361e0c175e29e0ee743d1dfe6;p=dotfiles.git diff --git a/.bashrc b/.bashrc index c1d88ed..3255cb6 100644 --- a/.bashrc +++ b/.bashrc @@ -10,6 +10,9 @@ 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 @@ -26,6 +29,7 @@ esac . "$HOME"/.shellrc 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 @@ -118,7 +122,7 @@ delegate_completion() { 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 @@ -131,8 +135,8 @@ delegate_completion() { 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 @@ -150,12 +154,12 @@ fi 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 which pyenv >/dev/null 2>&1; then