github/byobu
1
0
Fork 0
mirror of https://github.com/dustinkirkland/byobu synced 2025-08-22 14:24:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

* usr/bin/byobu: LP: #949385

Browse source 
- namespace a few environment variables more appropriately
This commit is contained in:
Dustin Kirkland 2012-03-07 17:40:14 -06:00
commit 4299f72d7b
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
debian/changelog vendored
View file

@ -6,6 +6,8 @@ byobu (5.16) unreleased; urgency=low
* usr/lib/byobu/reboot_required, usr/lib/byobu/updates_available:
- powersave flag and reload flag suffered from the same problem
as LP: #942469
* usr/bin/byobu: LP: #949385
- namespace a few environment variables more appropriately
-- Dustin Kirkland <kirkland@ubuntu.com> Thu, 23 Feb 2012 15:01:55 -0600

18
usr/bin/byobu
View file

@ -99,7 +99,7 @@ case $BYOBU_BACKEND in
[ -z "$SCREEN_TERM" ] && SCREEN_TERM="-2"
fi
fi
PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc"
BYOBU_PROFILE="-f $BYOBU_PREFIX/share/$PKG/profiles/tmuxrc"
sessions=$($BYOBU_BACKEND list-sessions 2>/dev/null) || true
;;
screen)
@ -127,14 +127,14 @@ case $BYOBU_BACKEND in
# Some users want to maintain separate configurations
# if they use both GNU Screen and byobu on the same system
if [ -r "$BYOBU_CONFIG_DIR/.screenrc" ]; then
PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/byoburc"
BYOBU_PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/byoburc"
else
PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/screenrc"
BYOBU_PROFILE="-c $BYOBU_PREFIX/share/$PKG/profiles/screenrc"
fi
NAME="-S $PKG"
# Zero out $NAME if user has specified a session name
BYOBU_SESSION_NAME="-S $PKG"
# Zero out $BYOBU_SESSION_NAME if user has specified a session name
for i in "$@"; do
case $i in -*r*|-*d*|-*D*|-*S*|-ls|-list) NAME= ;; esac
case $i in -*r*|-*d*|-*D*|-*S*|-ls|-list) BYOBU_SESSION_NAME= ;; esac
done
sessions=$($BYOBU_BACKEND -wipe 2>/dev/null) || true
;;
@ -148,7 +148,7 @@ esac
if [ "$#" = "0" ]; then
if [ "$CUSTOM_WINDOW_SET" = "1" ]; then
# Start new custom window set session
exec $BYOBU_BACKEND $SCREEN_TERM $NAME $PROFILE
exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE
else
case "$sessions" in
*\(*\)*)
@ -157,13 +157,13 @@ if [ "$#" = "0" ]; then
;;
*)
# Start new default session
exec $BYOBU_BACKEND $SCREEN_TERM $NAME $PROFILE $DEFAULT_WINDOW
exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE $DEFAULT_WINDOW
;;
esac
fi
else
# Launch with command line args
exec $BYOBU_BACKEND $SCREEN_TERM $NAME $PROFILE "$@"
exec $BYOBU_BACKEND $SCREEN_TERM $BYOBU_SESSION_NAME $BYOBU_PROFILE "$@"
fi
# vi: syntax=sh ts=4 noexpandtab