Commit 2a949daf authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Fix bashrc for naughty /etc/bash.bashrc's which set PS1

parent e56809a0

.bash_profile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ source_first ~/.profile /etc/profile 
# Prompt

if [ -n "$PS1" ]; then

	PS1="\[${PROMPTCODES}\e[1;${PROMPTCOLOUR:-0}m\]\u@\h: \$\[\e[0m\] "

	export _PS1=$PS1

	export PS1

fi

.bashrc

+2 −5
Original line number Diff line number Diff line
@@ -14,12 +14,9 @@ fi 
do_update



# Source global definitions

# (debian global bashrc has a bad habit of setting PS1, so store and revert 

# after)

_PS1="$PS1"

# (debian global bashrc has a bad habit of setting PS1, so revert after)

source_first /etc/bash.bashrc /etc/bashrc

PS1="$_PS1"

unset _PS1 grc

PS1="${_PS1-$PS1}"



source_each ~/.shell/aliases ~/.shell/$(get_platform)/aliases ~/.bash_aliases