but also make sure that we won't recurse, using a variable flag

This commit is contained in:
Dustin Kirkland 2011-06-29 01:04:08 +00:00
commit 36856a4406
2 changed files with 4 additions and 3 deletions

2
debian/changelog vendored
View file

@ -2,7 +2,7 @@ byobu (4.17) unreleased; urgency=low
* usr/bin/byobu-launch: LP: #802646
- ensure that .profile gets sourced if launching byobu by default,
but also make sure that we won't recurse!
but also make sure that we won't recurse, using a variable flag
* usr/lib/byobu/cpu_temp: LP: #799237, #802819
- fix temperature on Atom D510
* usr/bin/byobu-status:

View file

@ -39,8 +39,9 @@ if [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_DISABLE" != "1" ]; then
shopt -s histappend || true
[ -n "$PROMPT_COMMAND" ] && PROMPT_COMMAND="$PROMPT_COMMAND;history -a" || PROMPT_COMMAND="history -a"
# Source profile, as long as we won't recurse
if [ -r "$HOME/.profile" ]; then
(sed -e "s/#.*//" "$HOME/.profile" | grep -qs "$PKG-launch") || . "$HOME/.profile"
if [ -r "$HOME/.profile" ] && [ "$BYOBU_SOURCED_PROFILE" = "0" ]; then
BYOBU_SOURCED_PROFILE=1
. "$HOME/.profile"
fi
if byobu-launcher; then
# Wait very briefly for the no-logout flag to get written?