Update init.d with feedback from Adeodato Simó.

diff --git a/debian/changelog b/debian/changelog
index 794951b533f13226f5931b8d59e601c45503eb34..c805a6d375df825f566aff316a2d579eed40a3ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mythtv-status (0.9.0-5) unstable; urgency=medium
+
+  * Update init.d with feedback from Adeodato Simó. 
+
+ -- Andrew Ruthven <andrew@etc.gen.nz>  Sat, 08 Nov 2008 10:49:01 +1300
+
 mythtv-status (0.9.0-4) unstable; urgency=medium
 
   * It turns out that release 0.9.1 of mythtv-status snuck into

diff --git a/debian/init.d b/debian/init.d
index a254df54ff463e47c61f4782e9ae769f7440f39d..3274b13af1c53e03f9b487b6740b846fda1b883d 100644 (file)
--- a/debian/init.d
+++ b/debian/init.d
@@ -59,15 +59,13 @@ case "$1" in
     log_daemon_msg "Updating $DESC" "$NAME"
 
     # Just incase someone has removed their motd file.
-    [ ! -f /var/run/motd ] && touch /var/run/motd
-    [ ! -f /var/run/motd.orig ] && cp /var/run/motd /var/run/motd.orig
+    [ -f /var/run/motd ] || touch /var/run/motd
+    [ -f /var/run/motd.orig ] || cp /var/run/motd /var/run/motd.orig
 
     cp /var/run/motd.orig /var/run/motd.new
 
-    set +e
-    $DAEMON $ARGS -h $HOST >> /var/run/motd.new 2> /dev/null
-    ret=$?
-    set -e
+    ret=0
+    $DAEMON $ARGS -h $HOST >> /var/run/motd.new 2> /dev/null || ret=$?
     if [ $ret -eq 0 -o $ret -eq 1 ]; then
       mv /var/run/motd.new /var/run/motd
       log_end_msg 0