From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Fri, 7 Nov 2008 22:52:54 +0000 (+1300)
Subject: Update init.d with feedback from Adeodato Simó.
X-Git-Tag: debian-0.9.0-5^0
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ca64505207e33b71b0baaf7f98860152a1a5db9;p=mythtv-status.git

Update init.d with feedback from Adeodato Simó.
---

diff --git a/debian/changelog b/debian/changelog
index 794951b..c805a6d 100644
--- 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 a254df5..3274b13 100644
--- 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