usr/bin/byobu: allow users to specify their own -S, LP: #610134

This commit is contained in:
Dustin Kirkland 2010-07-27 18:06:47 -04:00
commit ef857c4364
2 changed files with 9 additions and 4 deletions

2
debian/changelog vendored
View file

@ -1,6 +1,6 @@
byobu (2.83) unreleased; urgency=low byobu (2.83) unreleased; urgency=low
* UNRELEASED * usr/bin/byobu: allow users to specify their own -S, LP: #610134
-- Dustin Kirkland <kirkland@ubuntu.com> Wed, 07 Jul 2010 11:36:03 -0400 -- Dustin Kirkland <kirkland@ubuntu.com> Wed, 07 Jul 2010 11:36:03 -0400

View file

@ -65,12 +65,17 @@ if [ -S "$SSH_AUTH_SOCK" ] && [ ! -h "$SSH_AUTH_SOCK" ] && [ -w "$RUN" ]; then
fi fi
PROFILE="-c /usr/share/$PKG/profiles/byoburc" PROFILE="-c /usr/share/$PKG/profiles/byoburc"
NAME="-S $PKG"
# Zero out $NAME if user has specified a -S
for i in $@; do
case $i in -S) NAME= ;; esac
done
# Now let's execute screen! # Now let's execute screen!
if [ "$#" = "0" ]; then if [ "$#" = "0" ]; then
out=$(screen -wipe 2>/dev/null) || true out=$(screen -wipe 2>/dev/null) || true
if [ "$CUSTOM_WINDOW_SET" = "1" ]; then if [ "$CUSTOM_WINDOW_SET" = "1" ]; then
# Start new custom window set session # Start new custom window set session
exec screen $SCREEN_TERM -S $PKG $PROFILE exec screen $SCREEN_TERM $NAME $PROFILE
else else
case "$out" in case "$out" in
*\(*\)*) *\(*\)*)
@ -79,11 +84,11 @@ if [ "$#" = "0" ]; then
;; ;;
*) *)
# Start new default session # Start new default session
exec screen $SCREEN_TERM -S $PKG $PROFILE $DEFAULT_WINDOW exec screen $SCREEN_TERM $NAME $PROFILE $DEFAULT_WINDOW
;; ;;
esac esac
fi fi
else else
# Launch with command line args # Launch with command line args
exec screen $SCREEN_TERM -S $PKG $PROFILE "$@" exec screen $SCREEN_TERM $NAME $PROFILE "$@"
fi fi