X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;ds=sidebyside;f=.shellrc;h=55dab97651ff1cc23ee5d3335e279863cbb08605;hb=fd4eaa6beacc9cebc388f98d9f7e842342cbec10;hp=0897f252d8e02faa2b78fcca2f3a6dd9cc9c33ab;hpb=50b7018946e9fb8818fc98ca65ce5664d3e28e03;p=dotfiles.git

diff --git a/.shellrc b/.shellrc
index 0897f25..55dab97 100644
--- a/.shellrc
+++ b/.shellrc
@@ -119,10 +119,10 @@ if test -n "$BASH_VERSION"; then
    delegate_completion() {
       local prog completion_f programs
       prog="$1"
-      completion_f="$2"
-      shift; shift
-      programs="$@"
       if has_completion "$prog"; then
+         completion_f="$2"
+         shift; shift
+         programs="$@"
          eval "_${prog}_completion_loader() {
             _completion_loader $prog
             complete -F $completion_f $programs
@@ -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,25 @@ 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
+
+   #if [ -n "$VIRTUAL_ENV" ]; then
+   #   . "$VIRTUAL_ENV/bin/activate"
+   #fi
+
 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 +355,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