.shellrc: minor refactoring

[dotfiles.git] / .shellrc

diff --git a/.shellrc b/.shellrc
index b0d2afe47dff8499c398e33dec46aad25bc3cc78..130281854e9d4421e36b12bb425c05ae769e547e 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
@@ -134,6 +134,7 @@ if test -n "$BASH_VERSION"; then
    }
 
    delegate_completion make _make m
+   delegate_completion ping _ping p
    delegate_completion rsync _rsync r
    delegate_completion ssh _ssh s
    delegate_completion wget _wget wget-m wget-wrapper ww
@@ -153,14 +154,21 @@ if test -n "$BASH_VERSION"; then
    #   rm -rf /tmp/pip_build_"$USER"
    #fi
 
+   #if which pyenv >/dev/null 2>&1; then
+   #   eval "`pyenv init -`"
+   #   eval "`pyenv virtualenv-init -`"
+   #fi
+
+   source virtualenvwrapper_lazy.sh 2>/dev/null
+
 elif test -n "$KSH_VERSION" -o -n "$FCEDIT"; then
    back() { cd - "$@"; }
    j() { jobs; }
 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
@@ -343,16 +351,6 @@ if which tmux >/dev/null 2>&1; then
 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