diff --git a/debian/changelog b/debian/changelog index 680b9696..8d79034f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ byobu (5.74) unreleased; urgency=low - merged in updated instance pricing script from https://github.com/erans/ec2instancespricing + [ Arminius Silvanus ] + * usr/share/byobu/profiles/bashrc: LP: #1280550 + - test the $BASH variable, rather than $SHELL, to tell if we're + running in a bash environment + [ Jan Klepek ] * usr/lib/byobu/include/config.py: LP: #1286249 - fall back to using the distro status file, fixes diff --git a/usr/share/byobu/profiles/bashrc b/usr/share/byobu/profiles/bashrc index 9f64427f..52cb1e94 100644 --- a/usr/share/byobu/profiles/bashrc +++ b/usr/share/byobu/profiles/bashrc @@ -24,7 +24,7 @@ case "$TERM" in esac if [ -n "$TMUX" ] || [ "${TERMCAP#*screen}" != "${TERMCAP}" ]; then # Ensure that we're in bash, in a byobu environment - if [ -n "$BYOBU_BACKEND" ] && [ "$SHELL" = "/bin/bash" ]; then + if [ -n "$BYOBU_BACKEND" ] && [ -n "$BASH" ]; then byobu_prompt_status() { local e=$?; [ $e != 0 ] && echo -e "$e "; } case "$BYOBU_DISTRO" in "Ubuntu")