X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=333091c0c2cb837abd4ff16bcaa0bf55f948bb58;hb=a349b130623707657fc99f512debf58d8a79cee0;hp=5975ab3a7f4ab27cd2002f40839f4bc7d4d12c77;hpb=20515fecab4ad47200eff26038c6cef8e2cef271;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 5975ab3..333091c 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
 
 
@@ -62,9 +67,9 @@ if test -n "$BASH_VERSION"; then
    [ "`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
@@ -121,13 +126,13 @@ if test -n "$BASH_VERSION"; then
    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
 
 elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
-   back() { cd - ${1:+"$@"}; }
+   back() { cd - "$@"; }
    clo() { clear; exit; }
    j() { jobs; }
 
@@ -144,11 +149,11 @@ fi
 #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() {
@@ -160,47 +165,53 @@ KillAll() {
 }
 
 
-# git-related
-
-# 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
-   # list remotes with URLs matching a regexp
-   list_remotes() {
-      GIT_REMOTES=""
-      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
-   }
-
-   # completion for cdremote - list remotes with directories as URLs
-   _cdremote_complete() {
-      local cur="${COMP_WORDS[COMP_CWORD]}";
-      list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
-      COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
-      GIT_REMOTES=""
-      unset GIT_REMOTES
+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`"
    }
 
-   complete -F _cdremote_complete cdremote
-
-   # completion for git-open - list remotes with http(s) URLs
-   _git_open() {
-      local cur="${COMP_WORDS[COMP_CWORD]}";
-      list_remotes '^http\(s\)\?://'
-      COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
-      GIT_REMOTES=""
-      unset GIT_REMOTES
-   }
-
-   complete -F _git_open git-open
+   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 ; }
+
+      # list remotes with URLs matching a regexp
+      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
+      }
+
+      # completion for cdremote - list remotes with directories as URLs
+      _cdremote_complete() {
+         local cur="${COMP_WORDS[COMP_CWORD]}";
+         list_remotes '^\(/\|\.\./\)' # (/ or ../ at the beginning)
+         COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
+         unset GIT_REMOTES
+      }
+
+      complete -F _cdremote_complete cdremote
+
+      # completion for git-open - list remotes with http(s) URLs
+      _git_open() {
+         local cur="${COMP_WORDS[COMP_CWORD]}";
+         list_remotes '^http\(s\)\?://'
+         COMPREPLY=(`compgen -W "$GIT_REMOTES" -- "$cur"`)
+         unset GIT_REMOTES
+      }
+
+      complete -F _git_open git-open
+   fi
 fi
 
 
@@ -306,28 +317,33 @@ mkcd() {
 }
 
 
-tmux() {
-   case "$TERM" in
-      rxvt)
-         TERM=rxvt-unicode command tmux "$@"
-      ;;
+if which tmux >/dev/null 2>&1; then
+   tmux() {
+      case "$TERM" in
+         rxvt)
+            TERM=rxvt-unicode command tmux "$@"
+         ;;
 
-      *)
-         command tmux "$@"
-      ;;
-   esac
-}
-
-
-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; }