From c07d24a8944646c212617ebc93b347f1938635b6 Mon Sep 17 00:00:00 2001 From: Dustin Kirkland Date: Fri, 23 Sep 2011 07:41:19 -0500 Subject: [PATCH] * usr/bin/byobu-launch, usr/bin/byobu-launcher-install: - clean up the variable name used to prevent double sourcing of profile --- debian/changelog | 2 ++ usr/bin/byobu-launch | 2 +- usr/bin/byobu-launcher-install | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 25e76093..84a09e87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 Wed, 21 Sep 2011 18:49:00 -0500 diff --git a/usr/bin/byobu-launch b/usr/bin/byobu-launch index 2e4f8fc3..ce705d8b 100755 --- a/usr/bin/byobu-launch +++ b/usr/bin/byobu-launch @@ -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 diff --git a/usr/bin/byobu-launcher-install b/usr/bin/byobu-launcher-install index 52ea83c1..0adb4276 100755 --- a/usr/bin/byobu-launcher-install +++ b/usr/bin/byobu-launcher-install @@ -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