Add standard .bash_logout

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index f027cc123032170fbbf361827660a1c3eba6cb66..7b362b894343cebf856e0e86016dc912f6a80210 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -15,6 +15,7 @@ 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
 
@@ -25,19 +26,23 @@ 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.
-   #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 type -p 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() {