X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=0b880623b992fb2d89e7809b3eeb6b2a29274002;hb=a6b6cd6191aaeff0aa7ab18cf6f1def45b4f7458;hp=38f7381a7b060becb2a9ceb9b5e6237fa1dca174;hpb=ed7cdee7b186fee9d99410d77ef722add83e4a32;p=dotfiles.git diff --git a/.shellrc b/.shellrc index 38f7381..0b88062 100644 --- a/.shellrc +++ b/.shellrc @@ -15,29 +15,34 @@ esac # Stop if non-interactive shell # [ -z "$PS1" ] && return -# append to the history file, don't overwrite it -shopt -s histappend +if test -n "$BASH_VERSION"; then + # append to the history file, don't overwrite it + shopt -s histappend -# check the window size after each command and, if necessary, -# update the values of LINES and COLUMNS. -shopt -s checkwinsize + # check the window size after each command and, if necessary, + # update the values of LINES and COLUMNS. + shopt -s checkwinsize -# If set, the pattern "**" used in a pathname expansion context will -# match all files and zero or more directories and subdirectories. -#shopt -s globstar + # If set, the pattern "**" used in a pathname expansion context will + # match all files and zero or more directories and subdirectories. + #shopt -s globstar +fi #if [ -x /usr/bin/dircolors ]; then - # I don't like these aliases - they work only in command line - # but not in scripts I run from command line. - # Color parameters must be passed via environment. - #alias ls='ls --color=auto' - #alias dir='dir --color=auto' - #alias vdir='vdir --color=auto' - - #alias grep='grep --color=auto' - #alias fgrep='fgrep --color=auto' - #alias egrep='egrep --color=auto' +# # I don't like these aliases - they work only in command line +# # but not in scripts I run from command line. +# # Color parameters must be passed via environment. +# # So instead I put them in shell scripts in ~/bin. +# alias ls='ls --color=auto' +# alias dir='dir --color=auto' +# alias vdir='vdir --color=auto' +# +# alias grep='grep --color=auto' +# alias fgrep='fgrep --color=auto' +# alias egrep='egrep --color=auto' +# +# alias dmesg='dmesg --human' #fi @@ -57,15 +62,14 @@ OPS1="$OPS1\\$" PS1="$OPS1 " -case "$SHELL" in -*/bash) +if test -n "$BASH_VERSION"; then [ "`type -t ls`" = alias ] && unalias ls [ "`type -t ll`" = alias ] && unalias ll [ "`type -t mc`" = alias ] && unalias mc - back() { cd - ${1:+"$@"}; } + back() { cd - "$@"; } clo() { clear; logout; } - eval 'functions() { typeset -f ${1:+"$@"}; }' + functions() { typeset -f "$@"; } j() { jobs; } if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then @@ -101,13 +105,17 @@ case "$SHELL" in ! has_completion $cmd && complete -o default -A command $cmd done - for cmd in dig host nslookup nc netcat nmap p ping ping6 socat \ + 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 ! has_completion $cmd && complete -A hostname $cmd done + if has_completion wget; then + complete -F _wget wget-m wget-wrapper ww + fi + 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; @@ -122,22 +130,19 @@ case "$SHELL" in fi complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser - if which pip >/dev/null 2>&1; then - eval "`pip completion --bash`" - rm -rf /tmp/pip_build_"$USER" - fi - ;; + #if type -p pip >/dev/null 2>&1; then + # eval "`pip completion --bash`" + # rm -rf /tmp/pip_build_"$USER" + #fi -*/ksh) - back() { cd - ${1:+"$@"}; } +elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then + back() { cd - "$@"; } clo() { clear; exit; } j() { jobs; } - ;; -*/sh) +else clo() { clear; exit; } - ;; -esac +fi # clear history, clear screen and logout @@ -148,11 +153,11 @@ esac #PWd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)/...\/\2/"; } -psg() { ps auxw | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; } -pswg() { ps auxwww | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\)'; } +psg() { ps auxw | grep -i "$@" | grep -v '\(ps auxw\|grep\)'; } +pswg() { ps auxwww | grep -i "$@" | grep -v '\(ps auxw\|grep\)'; } # Like pgrep -f -pidOf() { ps auxwww | grep -i ${1:+"$@"} | grep -v '\(ps auxw\|grep\|pidOf\|KillAll\)' | awk '{print $2}'; } +pidOf() { ps auxwww | grep -i "$@" | grep -v '\(ps auxw\|grep\|pidOf\|KillAll\)' | awk '{print $2}'; } # A kind of pkill/killall KillAll() { @@ -164,54 +169,57 @@ KillAll() { } -# git-related +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() { + cd "`git config --get remote.$1.url`" + } -# chdir to a remote's directory (if the remote is on the local FS) -cdremote() { - cd "`git config --get remote.$1.url`" -} + if test -n "$BASH_VERSION"; then + # completion for global aliases in .gitconfig + # fixup rbi rbia rbiap rbip - delegate to git-rebase completion + + _git_fixup() { _git_rebase ; } + _git_rbi() { _git_rebase ; } + _git_rbia() { _git_rebase ; } + _git_rbiap() { _git_rebase ; } + _git_rbip() { _git_rebase ; } -case "$SHELL" in - */bash) # list remotes with URLs matching a regexp - list_remotes() { + _list_remotes() { GIT_REMOTES="" + local remote for remote in `git remote`; do if git config --get remote.$remote.url | grep -q "$1"; then GIT_REMOTES="$GIT_REMOTES $remote" fi done - remote="" - unset remote } - # define completion for cdremote - list remotes with directories as URLs + # completion for cdremote - list remotes with directories as URLs _cdremote_complete() { local cur="${COMP_WORDS[COMP_CWORD]}"; - list_remotes '^/' + _list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning) COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`) - GIT_REMOTES="" unset GIT_REMOTES } complete -F _cdremote_complete cdremote - # define completion for git-open - list remotes with http(s) URLs + # completion for git-open - list remotes with http(s) URLs _git_open() { local cur="${COMP_WORDS[COMP_CWORD]}"; - list_remotes '^http\(s\)\?://' + _list_remotes '^http\(s\)\?://' COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`) - GIT_REMOTES="" unset GIT_REMOTES } complete -F _git_open git-open - ;; -esac + fi +fi -include() -{ +include() { cfg="$1" if [ -f "./$cfg" -a -r "./$cfg" ]; then echo "Reading config file \`$cfg'" 1>&2 @@ -226,12 +234,10 @@ include() mc() { - case "$SHELL" in - */bash) - MC_SAVE_OPS1="$OPS1" - OPS1="\u@\h " - ;; - esac + if test -n "$BASH_VERSION"; then + MC_SAVE_OPS1="$OPS1" + OPS1="\u@\h " + fi if [ -n "$SLOWTERM" ]; then MC_SLOW="--slow" @@ -315,28 +321,33 @@ mkcd() { } -tmux() { - case "$TERM" in - rxvt) - TERM=rxvt-unicode command tmux "$@" - ;; - - *) - command tmux "$@" - ;; - esac -} - +if which tmux >/dev/null 2>&1; then + tmux() { + case "$TERM" in + rxvt) + TERM=rxvt-unicode command tmux "$@" + ;; -if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then - source /usr/local/bin/virtualenvwrapper_lazy.sh + *) + command tmux "$@" + ;; + esac + } fi + #if which pyenv >/dev/null 2>&1; then # eval "`pyenv init -`" # eval "`pyenv virtualenv-init -`" #fi +if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then + source /usr/local/bin/virtualenvwrapper_lazy.sh +fi + + +if [ "$SHLVL" -eq 1 ] && which startx >/dev/null 2>&1; then + X() { startx >> .Xserver.log 2>&1; cyr; } +fi -X() { startx >> .Xserver.log 2>&1; cyr; } x() { exit; }