;;
esac
-
-OPS1="$OPS1\\$"
-PS1="$OPS1 "
-
-
if test -n "$BASH_VERSION"; then
[ "`type -t ls`" = alias ] && unalias ls
[ "`type -t ll`" = alias ] && unalias ll
has_completion() { return 0; }
if [ -z "$BASH_COMPLETION_COMPAT_DIR" ]; then
if [ "$SHELL" = /bin/bash ]; then
- if [ -d /usr/share/bash-completion ]; then
+ if [ -d /usr/share/bash-completion -a -f /usr/share/bash-completion/bash_completion ]; then
. /usr/share/bash-completion/bash_completion
has_completion() { [ -r /usr/share/bash-completion/completions/$1 ]; }
elif [ -f /etc/bash_completion ]; then
fi
fi
- if [ -d "$HOME"/.bash_completion.d ]; then
- for _compf in "$HOME"/.bash_completion.d/*; do
- . $_compf
- done
- fi
-
for cmd in builtin cgmem_nice command dbus-launch exec \
- killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg su sudo \
- time whence whereis which xargs; do
- ! has_completion $cmd && complete -o default -A command $cmd
+ killall man nice nohup pidof pidOf KillAll pgrep pkill psg pswg \
+ su sudo time whence whereis which xargs; do
+ ! has_completion $cmd && complete -o default -A command $cmd
done
for cmd in dig host mtr nslookup nc netcat nmap p ping ping6 socat \
- telnet t tt \
- tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \
- whois wd wget wget-download wget-m wget-wrapper ww; do
- ! has_completion $cmd && complete -A hostname $cmd
+ telnet t tt \
+ tcptraceroute tcptraceroute6 tracert tracert6 traceroute traceroute6 \
+ whois wd wget wget-download wget-m wget-wrapper ww; do
+ ! has_completion $cmd && complete -A hostname $cmd
done
for cmd in distribute ftp lftp r rsync \
- s scp ssh smbclient tcpdump tshark wireshark; do
- ! has_completion $cmd && complete -o default -A hostname $cmd
+ s scp ssh smbclient tcpdump tshark wireshark; do
+ ! has_completion $cmd && complete -o default -A hostname $cmd
done
+ if [ -d "$HOME"/.bash_completion.d ]; then
+ for _compf in "$HOME"/.bash_completion.d/*; do
+ . $_compf
+ done
+ fi
+
delegate_completion() {
local prog programs
prog=$1
fi
complete -W "`echo $BROWSER | sed 's/:/ /g'`" start-browser
+ if [ "`type -t short_curdir`" != function -a \
+ -r "$HOME"/admin/prog/bash_prompt ]; then
+ . "$HOME"/admin/prog/bash_prompt
+ fi
+
#if type -p pip >/dev/null 2>&1; then
# eval "`pip completion --bash`"
# rm -rf /tmp/pip_build_"$USER"
# eval "`pyenv virtualenv-init -`"
#fi
- source virtualenvwrapper_lazy.sh 2>/dev/null
+ . virtualenvwrapper_lazy.sh 2>/dev/null
if [ -n "$VIRTUAL_ENV" ] && ! type deactivate >/dev/null 2>&1; then
. "$VIRTUAL_ENV/bin/activate"
j() { jobs; }
fi
+PS1="$OPS1"
# clear screen and history, logout
chlo() { clear; cd; >$HISTFILE; unset HISTFILE; history -c; logout || exit; }
mc() {
if test -n "$BASH_VERSION"; then
MC_SAVE_OPS1="$OPS1"
- OPS1="\u@\h "
+ if [ "`type -t short_curdir`" = function ]; then
+ OPS1="\`cgmem_which_prompt\`\u@\${HOSTNAME::5}:\`short_curdir\` "
+ OPS1+="\$(prompt_git)\\$\$SHLVL "
+ else
+ OPS1="\u@\h:\W \\$"
+ fi
fi
if [ -n "$SLOWTERM" ]; then