X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=62e1f0bb324cbe0f5851ffd0fe105efe758da45f;hb=b36a16a234296f5957db75ae0b0f4cc7b6e40df7;hp=8e0f9292a8a68963a4e3eb836c44c77e0458cefb;hpb=8c5aba677b6b6d5fe66a696f17e5dadec73b7099;p=dotfiles.git diff --git a/.shellrc b/.shellrc index 8e0f929..62e1f0b 100644 --- a/.shellrc +++ b/.shellrc @@ -57,11 +57,6 @@ 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 @@ -71,57 +66,57 @@ if test -n "$BASH_VERSION"; then functions() { typeset -f "$@"; } j() { jobs; } - has_completion() { return 0; } if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then - if [ "$SHELL" = /bin/bash ]; then - if [ -d /usr/share/bash-completion ]; then - . /usr/share/bash-completion/bash_completion - has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; } - elif [ -f /etc/bash_completion ]; then - . /etc/bash_completion - has_completion() { [ -r /etc/bash_completion.d/$1 ]; } - elif [ -d /etc/bash_completion.d ]; then - for _compf in /etc/bash_completion.d/*; do - . $_compf - done - has_completion() { [ -r /etc/bash_completion.d/$1 ]; } - fi - elif [ "$SHELL" = /usr/local/bin/bash ]; then - if [ -d /usr/local/etc/bash_completion.d ]; then - for _compf in /usr/local/etc/bash_completion.d/*; do - . $_compf - done - has_completion() { [ -r /usr/local/etc/bash_completion.d/$1 ]; } - 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, cannot source bash_completion" >&2 fi fi - if [ -d "$HOME"/.bash_completion.d ]; then - for _compf in "$HOME"/.bash_completion.d/*; do - . $_compf - done - 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 wd wget wget-download wget-m wget-wrapper ww; do - ! has_completion $cmd && complete -A hostname $cmd + 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 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 [ -d "$HOME"/.bash_completion.d ]; then + for _compf in "$HOME"/.bash_completion.d/*; do + . $_compf + done + fi + delegate_completion() { local prog programs prog=$1 @@ -144,16 +139,20 @@ if test -n "$BASH_VERSION"; then delegate_completion ssh s delegate_completion wget wget-m wget-wrapper ww - unset has_completion delegate_completion - 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" @@ -164,7 +163,7 @@ if test -n "$BASH_VERSION"; then # eval "`pyenv virtualenv-init -`" #fi - source virtualenvwrapper_lazy.sh 2>/dev/null + . virtualenvwrapper_lazy.sh 2>/dev/null if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; then . "$VIRTUAL_ENV/bin/activate" @@ -180,6 +179,7 @@ elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then j() { jobs; } fi +PS1="$OPS1" # clear screen and history, logout chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; } @@ -221,7 +221,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then fi if [ -n "$remote" ] && git config --get remote.$remote.url | - grep -q '^\(file:/\|/\|\.\./\)'; then + grep -q '^\(file:/\|/\|\.\./\)'; then # (file:/ or / or ../ at the beginning) cdgitpath remote.$remote.url else @@ -231,14 +231,20 @@ if test -x /usr/bin/git >/dev/null 2>&1; then 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 + 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 - unset GIT_REMOTES - echo "Cannot find directory for any remote" >&2 + echo "Cannot find directory for remote $1" >&2 echo "Usage: cdremote [remote_name]" >&2 return 1 fi @@ -259,7 +265,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then _git_push_to_all_remotes() { __gitcomp_nl "$(__git_heads)" ; } _cdgitpath_complete() { - local cword="${COMP_CWORD}" cur="${COMP_WORDS[COMP_CWORD]}"; + local cur="${COMP_WORDS[COMP_CWORD]}" COMPREPLY=(`compgen -W "$(__git_config_get_set_variables)" -- "$cur"`) } @@ -286,7 +292,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then # 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"`) unset GIT_REMOTES @@ -332,7 +338,12 @@ 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\` " + OPS1+="\$(prompt_git)\\$\$SHLVL " + else + OPS1="\u@\h:\W \\$" + fi fi if [ -n "$SLOWTERM" ]; then