X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=bc164f1a305a08561600ff07a98d2340e8a79da8;hb=0addb50cbc67c7f01d0c34cd77eef7f135ff9c68;hp=edb29b8d6c863b5d43dc94c76de31bd7b1a17519;hpb=d16290e59177c73d7f41eca832b30ee49656d2c0;p=dotfiles.git diff --git a/.shellrc b/.shellrc index edb29b8..bc164f1 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 @@ -74,7 +69,7 @@ if test -n "$BASH_VERSION"; then has_completion() { return 0; } if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then if [ "$SHELL" = /bin/bash ]; then - if [ -d /usr/share/bash-completion ]; then + if [ -d /usr/share/bash-completion -a -f /usr/share/bash-completion/bash_completion ]; then . /usr/share/bash-completion/bash_completion has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; } elif [ -f /etc/bash_completion ]; then @@ -98,12 +93,6 @@ 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 @@ -113,15 +102,21 @@ if test -n "$BASH_VERSION"; then for cmd in dig host mtr nslookup nc netcat nmap p ping ping6 socat \ telnet t tt \ tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \ - whois wget wget-m wget-wrapper ww; do + 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; + ! 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 @@ -130,7 +125,7 @@ if test -n "$BASH_VERSION"; then programs="$@" eval "_${prog}_completion_loader() { _completion_loader $prog - complete -F _$prog $programs + complete -o nospace -F _$prog $programs unset _${prog}_completion_loader return 124 }" @@ -154,6 +149,11 @@ if test -n "$BASH_VERSION"; 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 + fi + #if type -p pip >/dev/null 2>&1; then # eval "`pip completion --bash`" # rm -rf /tmp/pip_build_"$USER" @@ -164,7 +164,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 +180,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; } @@ -220,13 +221,8 @@ if test -x /usr/bin/git >/dev/null 2>&1; then remote="$1" fi - if [ -z "$remote" ]; then - echo "Cannot find remote for branch $branch" >&2 - echo "Usage: cdremote [remote_name]" >&2 - return 1 - fi - - if git config --get remote.$remote.url | grep -q '^\(file:/\|/\|\.\./\)'; then + if [ -n "$remote" ] && git config --get remote.$remote.url | + grep -q '^\(file:/\|/\|\.\./\)'; then # (file:/ or / or ../ at the beginning) cdgitpath remote.$remote.url else @@ -236,14 +232,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 @@ -264,7 +266,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"`) } @@ -276,7 +278,7 @@ if test -x /usr/bin/git >/dev/null 2>&1; then # list remotes with URLs matching a regexp _list_remotes() { - if [ $# -ne 1 ]; then + if [ $# -ne 1 ]; then echo "Usage: _list_remotes remote_regexp" >&2 return 1 fi @@ -291,7 +293,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 @@ -337,7 +339,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