diff --git a/debian/changelog b/debian/changelog index 534c9318..a7ae1bc9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,22 +1,13 @@ -byobu (4.4) unreleased; urgency=low - - * UNRELEASED - - -- Dustin Kirkland Tue, 24 May 2011 22:29:05 -0500 - -byobu (4.3-0ubuntu1) oneiric; urgency=low - - * usr/lib/byobu/uptime: fix string bug in uptime introduced by smoser's - changes - * usr/lib/byobu/disk_io: fix scaling, LP: #787773 - - -- Dustin Kirkland Tue, 24 May 2011 22:29:00 -0500 - byobu (4.3) unreleased; urgency=low [ Dustin Kirkland ] * usr/lib/byobu/uptime: fix string bug in uptime introduced by smoser's changes + * usr/lib/byobu/disk_io: fix scaling, LP: #787773 + * usr/bin/byobu-disable, usr/bin/byobu-select-session, usr/bin/shell: + - fix some of the messaging + - add a welcome message with the toggle on/off info + - fix the motd display at auto launch, which was broken recently [ Scott Moser ] * usr/lib/byobu/.shutil: fix rounding across a decimal point in fpdiv() diff --git a/usr/bin/byobu-disable b/usr/bin/byobu-disable index ba653963..191d4e94 100755 --- a/usr/bin/byobu-disable +++ b/usr/bin/byobu-disable @@ -20,8 +20,15 @@ byobu-launcher-uninstall echo -echo "The Byobu window manager will no longer be launched automatically at each text login." +echo "The Byobu window manager will no longer be launched automatically at login." echo echo "To re-enable this behavior later, just run:" echo " byobu-enable" echo + +# If we're in a byobu session, let's exit that too +case "$STY" in + *byobu) + screen -X at 0 quit + ;; +esac diff --git a/usr/bin/byobu-select-session b/usr/bin/byobu-select-session index 4aaf60dd..3ee72e78 100755 --- a/usr/bin/byobu-select-session +++ b/usr/bin/byobu-select-session @@ -65,6 +65,8 @@ if i > 1: tries += 1 choice = "" sys.stderr.write("\nERROR: Invalid input\n"); +else: + os.execvp("byobu", ["", "shell"]) if choice: if choice == i-1: diff --git a/usr/bin/shell b/usr/bin/shell index 424692f1..b2ed1c31 100755 --- a/usr/bin/shell +++ b/usr/bin/shell @@ -17,8 +17,21 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -if [ -r /etc/motd ]; then - # Prune the byobu advert, if you're already running within byobu - grep -v "^For a superior command line experience, enable our text-based window manger" /etc/motd | grep -v "^ byobu-enable" +PKG="byobu" +FLAG="$HOME/.$PKG/.welcome-displayed" + +[ -r /etc/motd ] && cat /etc/motd + +if [ ! -e "$FLAG" ]; then + echo + echo "Welcome to Ubuntu's powerful, text-based window manager, Byobu." + echo "You can toggle the launch of Byobu at login with:" + echo " 'byobu-disable' and 'byobu-enable'" + echo + echo "For tips, tricks, and more information, see:" + echo " * https://help.ubuntu.com/community/Byobu" + echo + touch "$FLAG" fi + [ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh