* byobu: make this script set -e, such that it will fail if byobu-janitor

exits non-zero
  * byobu-janitor: check that ~/.byobu is writable; print an error message
    and exit non-zero if not; handles odd situation where user launches
    byobu from a sudo/root shell, and root owns their ~/.byobu dir, but then
    they launch as non-root sometime later, LP: #394147


Signed-off-by: Dustin Kirkland <kirkland@canonical.com>

byobu

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 #
 #    byobu - screen wrapper script
 #    Copyright (C) 2008-2009 Canonical Ltd.

byobu-janitor

@@ -32,6 +32,13 @@ OLDPKG="screen-profiles"
 DEFAULT_PROFILE="light"
 PROFILE="$HOME/.$PKG/profile"
 
+# Affects: users who launched using sudo, such that their config dir
+# is not writable by them
+if [ -d "$HOME/.$PKG" ] && [ ! -w "$HOME/.$PKG" ]; then
+	echo "ERROR: [$HOME/.$PKG] is not writable by the current user" 1>&2
+	exit 1
+fi
+
 # Affects: Upgrades from screen-profiles
 # If the old config dir exists, but the new one doesn't, provide a migration mechanism.
 if [ -d "$HOME/.$OLDPKG" ] && [ ! -e "$HOME/.$PKG" ]; then

debian/changelog

@@ -1,8 +1,14 @@
 byobu (2.20) unreleased; urgency=low
 
+  * byobu: make this script set -e, such that it will fail if byobu-janitor
+    exits non-zero
+  * byobu-janitor: check that ~/.byobu is writable; print an error message
+    and exit non-zero if not; handles odd situation where user launches
+    byobu from a sudo/root shell, and root owns their ~/.byobu dir, but then
+    they launch as non-root sometime later, LP: #394147
   * debian/source_byobu.py: add apport hooks for byobu
 
- -- Dustin Kirkland <kirkland@ubuntu.com>  Thu, 09 Jul 2009 13:31:15 -0500
+ -- Dustin Kirkland <kirkland@ubuntu.com>  Sun, 12 Jul 2009 12:36:38 -0500
 
 byobu (2.19-0ubuntu1) karmic; urgency=low