.gitconfig: reorder options for 'tags' alias

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index b0d2afe47dff8499c398e33dec46aad25bc3cc78..fa8fa9536ec3a53614f2054cfd3766f76f2cb6fc 100644 (file)
--- a/.shellrc
+++ b/.shellrc
@@ -9,11 +9,11 @@
 # If not running interactively, don't do anything
 case $- in
     *i*) ;;
-      *) return;;
+      *) return ;;
 esac
 
 # Stop if non-interactive shell
-# [ -z "$PS1" ] && return
+[ -z "$PS1" ] && return
 
 if test -n "$BASH_VERSION"; then
    # append to the history file, don't overwrite it
@@ -159,8 +159,8 @@ elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
 fi
 
 
-# clear history, clear screen and logout
-#chlo() { cd; unset HISTFILE; rm -f .sh_history; history -c; clear; logout || exit; }
+# clear screen and history, logout
+chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
 
 
 if test -x /usr/bin/git >/dev/null 2>&1; then
@@ -348,10 +348,7 @@ fi
 #   eval "`pyenv virtualenv-init -`"
 #fi
 
-if [ -f /usr/local/bin/virtualenvwrapper_lazy.sh ]; then
-   source /usr/local/bin/virtualenvwrapper_lazy.sh
-fi
-
+source virtualenvwrapper_lazy.sh 2>/dev/null
 
 if [ "$SHLVL" -eq 1 ] && which startx >/dev/null 2>&1; then
    X() { startx >> .Xserver.log 2>&1; cyr; }