# Stop if non-interactive shell
[ -z "$PS1" ] && return
+PS1="$OPS1$SHLVL "
+
if test -n "$BASH_VERSION"; then
# append to the history file, don't overwrite it
shopt -s histappend
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 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
mc() {
if test -n "$BASH_VERSION"; then
MC_SAVE_OPS1="$OPS1"
- OPS1="\u@\h "
+ OPS1="\u@\h \W \\$"
fi
if [ -n "$SLOWTERM" ]; then