From 497f2d5aa418909932c404aa5b42f5ad0d727b43 Mon Sep 17 00:00:00 2001
From: Dustin Kirkland <kirkland@canonical.com>
Date: Mon, 14 Dec 2009 16:36:02 -0600
Subject: [PATCH] * byobu:   - check number of args for "1", and "-v", LP:
 #494465   - make more zsh friendly, don't use -c

---
 byobu            | 6 ++----
 debian/changelog | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/byobu b/byobu
index e2f08fe2..7379554d 100755
--- a/byobu
+++ b/byobu
@@ -40,13 +40,11 @@ byobu-janitor --force
 printf "\033]0;${USER}@$(hostname) - ${PKG}\007"
 
 # Launch motd+shell, unless the user has default windows set to launch
-[ -x "$SHELL" ] || SHELL="/bin/sh"
-DEFAULT_WINDOW="$SHELL -c motd+shell"
-grep -qs "^[^#]" "$HOME/.$PKG/windows" && DEFAULT_WINDOW=
+grep -qs "^[^#]" "$HOME/.$PKG/windows" && DEFAULT_WINDOW= || DEFAULT_WINDOW="motd+shell"
 
 # Now let's execute screen!
 if [ "$#" = "0" ]; then
-	exec screen -c "/usr/share/$PKG/profiles/byoburc" $DEFAULT_WINDOW
+	exec screen -c "/usr/share/$PKG/profiles/byoburc" -t shell $DEFAULT_WINDOW
 else
 	exec screen -c "$HOME/.$PKG/profile" "$@"
 fi
diff --git a/debian/changelog b/debian/changelog
index 94e9b151..2a716a0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 byobu (2.41) unreleased; urgency=low
 
-  * byobu: check number of args for "1", and "-v", LP: #494465
+  * byobu:
+    - check number of args for "1", and "-v", LP: #494465
+    - make more zsh friendly, don't use -c
 
  -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 13 Dec 2009 19:16:43 -0800