# 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
. /usr/local/etc/bash_completion.d/*
fi
else
- echo "Unknown OS type, canot source bash_completion" >&2
+ echo "Unknown OS type, cannot source bash_completion" >&2
fi
fi
done
delegate_completion() {
- local prog completion_f programs
- prog="$1"
- completion_f="$2"
- shift; shift
- programs="$@"
- if has_completion "$prog"; then
+ local prog programs
+ prog=$1
+ if has_completion $prog; then
+ shift
+ programs="$@"
eval "_${prog}_completion_loader() {
_completion_loader $prog
- complete -F $completion_f $programs
+ complete -F _$prog $programs
unset _${prog}_completion_loader
return 124
}"
- complete -F _"$prog"_completion_loader $programs
+ complete -F _${prog}_completion_loader $programs
fi
}
- delegate_completion make _make m
- delegate_completion rsync _rsync r
- delegate_completion ssh _ssh s
- delegate_completion wget _wget wget-m wget-wrapper ww
+ delegate_completion make m
+ delegate_completion ping p
+ delegate_completion rsync r
+ delegate_completion ssh s
+ delegate_completion wget wget-m wget-wrapper ww
unset has_completion delegate_completion
# 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
}
if test -n "$BASH_VERSION"; then
- # completion for global aliases in .gitconfig
+ # completion for aliases in global .gitconfig
# fixup rbi rbia rbiap rbip - do refs name completion
_git_fixup() { __gitcomp_nl "$(__git_refs)" ; }
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