mirror of
https://github.com/dustinkirkland/byobu
synced 2025-08-22 22:34:23 -07:00
but also make sure that we won't recurse, using a variable flag
This commit is contained in:
parent
2313a192c5
commit
36856a4406
2 changed files with 4 additions and 3 deletions
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -2,7 +2,7 @@ byobu (4.17) unreleased; urgency=low
|
||||||
|
|
||||||
* usr/bin/byobu-launch: LP: #802646
|
* usr/bin/byobu-launch: LP: #802646
|
||||||
- ensure that .profile gets sourced if launching byobu by default,
|
- 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
|
* usr/lib/byobu/cpu_temp: LP: #799237, #802819
|
||||||
- fix temperature on Atom D510
|
- fix temperature on Atom D510
|
||||||
* usr/bin/byobu-status:
|
* usr/bin/byobu-status:
|
||||||
|
|
|
@ -39,8 +39,9 @@ if [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_DISABLE" != "1" ]; then
|
||||||
shopt -s histappend || true
|
shopt -s histappend || true
|
||||||
[ -n "$PROMPT_COMMAND" ] && PROMPT_COMMAND="$PROMPT_COMMAND;history -a" || PROMPT_COMMAND="history -a"
|
[ -n "$PROMPT_COMMAND" ] && PROMPT_COMMAND="$PROMPT_COMMAND;history -a" || PROMPT_COMMAND="history -a"
|
||||||
# Source profile, as long as we won't recurse
|
# Source profile, as long as we won't recurse
|
||||||
if [ -r "$HOME/.profile" ]; then
|
if [ -r "$HOME/.profile" ] && [ "$BYOBU_SOURCED_PROFILE" = "0" ]; then
|
||||||
(sed -e "s/#.*//" "$HOME/.profile" | grep -qs "$PKG-launch") || . "$HOME/.profile"
|
BYOBU_SOURCED_PROFILE=1
|
||||||
|
. "$HOME/.profile"
|
||||||
fi
|
fi
|
||||||
if byobu-launcher; then
|
if byobu-launcher; then
|
||||||
# Wait very briefly for the no-logout flag to get written?
|
# Wait very briefly for the no-logout flag to get written?
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue