* usr/bin/byobu-launch, usr/bin/byobu-launcher-install:

- clean up the variable name used to prevent double sourcing of profile
This commit is contained in:
Dustin Kirkland 2011-09-23 07:41:19 -05:00
commit c07d24a894
3 changed files with 4 additions and 2 deletions

2
debian/changelog vendored
View file

@ -7,6 +7,8 @@ byobu (4.35) unreleased; urgency=low
- smooth upgrades from older byobu (<= 4.0)
* usr/lib/byobu/reboot_required:
- fix path
* usr/bin/byobu-launch, usr/bin/byobu-launcher-install:
- clean up the variable name used to prevent double sourcing of profile
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 21 Sep 2011 18:49:00 -0500

View file

@ -47,7 +47,7 @@ if [ "$BYOBU_SOURCED_PROFILE" != "1" ] && [ "$LC_BYOBU" != "0" ] && [ "$BYOBU_DI
fi
[ -n "$PROMPT_COMMAND" ] && PROMPT_COMMAND="$PROMPT_COMMAND;history -a" || PROMPT_COMMAND="history -a"
# Source profile, if necessary
[ -z "$sourced" ] && [ -r "$HOME/.profile" ] && . "$HOME/.profile"
[ -z "$_byobu_sourced" ] && [ -r "$HOME/.profile" ] && . "$HOME/.profile"
if byobu-launcher; then
# Wait very briefly for the no-logout flag to get written?
sleep 0.1

View file

@ -42,7 +42,7 @@ update_flag() {
}
install_launcher() {
printf "sourced=1 . byobu-launch\n" >> "$1"
printf "_byobu_sourced=1 . byobu-launch\n" >> "$1"
}
# Sanitize the environment