X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=e43c215913f3778b697c0804991596ffb8d6a761;hb=90408552910ffa146a246fa96e6095661b3bbdb9;hp=eb741b1345c1124b90dc9bc7a96ece9ffe7c3357;hpb=41552ba848ec72fd207ae6fba1ab97b55574c2f6;p=dotfiles.git diff --git a/.shellrc b/.shellrc index eb741b1..e43c215 100644 --- a/.shellrc +++ b/.shellrc @@ -2,14 +2,53 @@ # $HOME/.shellrc # -OPS1="$OPS1\\$" -PS1="$OPS1 " +# ~/.bashrc: executed by bash(1) for non-login shells. +# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc) +# for examples + +# If not running interactively, don't do anything +case $- in + *i*) ;; + *) return;; +esac + +# Stop if non-interactive shell +# [ -z "$PS1" ] && return + +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 + + # 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. +# # 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 case "$HOME" in /home/*) - home_link="`readlink /home`" - if [ -n "$home_link" ]; then + if [ -L /home ]; then START_DIR="`pwd`" && cd "$HOME" && HOME="`pwd`" && @@ -18,15 +57,19 @@ case "$HOME" in ;; esac -case "$SHELL" in -*/bash) + +OPS1="$OPS1\\$" +PS1="$OPS1 " + + +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 @@ -62,18 +105,50 @@ 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 + _wget_completion_loader() { + _completion_loader wget + complete -F _wget wget-m wget-wrapper ww + unset _wget_completion_loader + return 124 + } + complete -F _wget_completion_loader 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; done + if has_completion rsync; then + _rsync_completion_loader() { + _completion_loader rsync + complete -F _rsync r + unset _rsync_completion_loader + return 124 + } + complete -F _rsync_completion_loader r + fi + + if has_completion ssh; then + _ssh_completion_loader() { + _completion_loader ssh + complete -F _ssh s + unset _ssh_completion_loader + return 124 + } + complete -F _ssh_completion_loader s + fi + + unset has_completion + complete -A job bg fg j jobs wait complete -A variable unset @@ -81,36 +156,42 @@ case "$SHELL" in complete -W "`cd \"$HOME/lib/config\" && echo *`" include fi complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser - ;; -*/ksh) - back() { cd - ${1:+"$@"}; } + #if type -p pip >/dev/null 2>&1; then + # eval "`pip completion --bash`" + # rm -rf /tmp/pip_build_"$USER" + #fi + +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 -#chlo() { cd; unset HISTFILE; rm -f .*history*; clo; } +#chlo() { cd; unset HISTFILE; rm -f .sh_history; history -c; clo; } #Pwd() { pwd | sed "s/.*\/\(.*\)\/\(.*\)\/\(.*\)\/\(.*\)/...\/\2\/\3\/\4/"; } #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() { + if [ -z "$1" -o -n "$3" ]; then + echo "Usage: KillAll [-signal] proc_regexp" >&2 + return 1 + fi if [ -z "$2" ]; then kill `pidOf "$1"` else @@ -119,12 +200,70 @@ KillAll() { } -x() { exit; } -X() { startx >> .Xserver.log 2>&1; cyr; } +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() { + if [ -z "$1" -o -n "$2" ]; then + echo "Usage: cdremote remote_name" >&2 + return 1 + fi + cd "`git config --get remote.$1.url`" + } + + if test -n "$BASH_VERSION"; then + # completion for global aliases in .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)" ; } + + # list remotes with URLs matching a regexp + _list_remotes() { + if [ -z "$1" -o -n "$2" ]; then + echo "Usage: _list_remotes remote_regexp" >&2 + return 1 + fi + 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 + } + + # completion for cdremote and git-open - 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 '^\(/\|\.\./\)' # (/ or ../ at the beginning) + } + + complete -F _cdremote_complete cdremote + + # completion for git-open - list remotes with http(s) URLs + _git_open() { + _list_remotes_completion '^http\(s\)\?://' + } + + complete -F _git_open git-open + fi +fi -include() -{ +include() { cfg="$1" if [ -f "./$cfg" -a -r "./$cfg" ]; then echo "Reading config file \`$cfg'" 1>&2 @@ -138,20 +277,12 @@ include() } -function mkcd { - if [ $# -ne 1 ]; then - echo "Usage: mkcd directory_name" >&2 - elif [ -d "$1" ]; then - cd "$1" - elif [ -e "$1" ]; then - echo "Error: $1 is a file" >&2 - else - mkdir -p "$1" && cd "$1" +mc() { + if test -n "$BASH_VERSION"; then + MC_SAVE_OPS1="$OPS1" + OPS1="\u@\h " fi -} - -mc() { if [ -n "$SLOWTERM" ]; then MC_SLOW="--slow" fi @@ -212,20 +343,55 @@ mc() { rc=1 fi + [ -n "$MC_SAVE_OPS1" ] && OPS1="$MC_SAVE_OPS1" [ -n "$MC_SAVE_TERM" ] && TERM="$MC_SAVE_TERM" - unset MC_FOUND MC_PWD_FILE MC_SAVE_TERM MC_SLOW MC_TMP_DIR MC_XTERM + unset MC_FOUND MC_PWD_FILE MC_SAVE_OPS1 MC_SAVE_TERM \ + MC_SLOW MC_TMP_DIR MC_XTERM + return $rc } -tmux() { - case "$TERM" in - rxvt) - TERM=rxvt-unicode command tmux "$@" - ;; - - *) - command tmux "$@" - ;; - esac +mkcd() { + if [ $# -ne 1 ]; then + echo "Usage: mkcd directory_name" >&2 + elif [ -d "$1" ]; then + cd "$1" + elif [ -e "$1" ]; then + echo "Error: $1 is a file" >&2 + else + mkdir -p "$1" && cd "$1" + fi } + + +if which tmux >/dev/null 2>&1; then + tmux() { + case "$TERM" in + rxvt) + TERM=rxvt-unicode command tmux "$@" + ;; + + *) + 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() { exit; }