X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.shellrc;h=2b79a64297134e4e29e55d84a995a780729b3fd3;hb=96500da2b1430bff690d368bd2f0ccec23305aa8;hp=f027cc123032170fbbf361827660a1c3eba6cb66;hpb=c31a33ecc17ef4720fded354f5adf520e43fc798;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index f027cc1..2b79a64 100644
--- 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() {
@@ -160,8 +165,7 @@ 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`"
@@ -199,6 +203,7 @@ if test -n "$BASH_VERSION"; then
 
    complete -F _git_open git-open
 fi
+fi
 
 
 include() {
@@ -303,6 +308,7 @@ mkcd() {
 }
 
 
+if which tmux >/dev/null 2>&1; then
 tmux() {
    case "$TERM" in
       rxvt)
@@ -314,6 +320,7 @@ tmux() {
       ;;
    esac
 }
+fi
 
 
 #if which pyenv >/dev/null 2>&1; then
@@ -326,5 +333,8 @@ if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then
 fi
 
 
+if [ "$SHLVL" -eq 1 ] && which startx >/dev/null 2>&1; then
 X() { startx >> .Xserver.log 2>&1; cyr; }
+fi
+
 x() { exit; }