* usr/share/byobu/profiles/bashrc: LP: #1280550

- test the $BASH variable, rather than $SHELL, to tell if we're
    running in a bash environment
This commit is contained in:
Dustin Kirkland 2014-02-28 16:37:02 -06:00
commit 3c5e3a945e
2 changed files with 6 additions and 1 deletions

5
debian/changelog vendored
View file

@ -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

View file

@ -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")