From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Sat, 19 Apr 2008 19:12:27 +0000 (+1200)
Subject: Update the molly-guard related bits reflecting Martin Krafft's released 0.4 version.
X-Git-Tag: 0.7.4~2
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87d70ab85934ab3bd37dcea8ee3f4b03f208ef18;p=mythtv-status.git

Update the molly-guard related bits reflecting Martin Krafft's released 0.4 version.
---

diff --git a/debian/install b/debian/install
index 7eaaa8c..0e5ba02 100644
--- a/debian/install
+++ b/debian/install
@@ -1,4 +1,4 @@
 bin/mythtv-status usr/bin
 bin/mythtv_recording_now usr/bin
 bin/mythtv_recording_soon usr/bin
-molly-guard/mythtv-recording-soon usr/share/molly-guard/checks.d/40-mythtv-recording-now
+molly-guard/mythtv-recording-soon etc/molly-guard/run.d/40-mythtv-recording-now
diff --git a/molly-guard/mythtv-recording-soon b/molly-guard/mythtv-recording-soon
index f9604bc..d241dd8 100755
--- a/molly-guard/mythtv-recording-soon
+++ b/molly-guard/mythtv-recording-soon
@@ -3,7 +3,7 @@
 ME=molly-guard
 
 if [ ! -f /usr/bin/mythtv_recording_soon ]; then
-  echo "I: I can't find /usr/bin/mythtv_recording_soon, skipping check"
+  echo "I: I can't find /usr/bin/mythtv_recording_soon, skipping check" >&2
   exit 0;
 fi
 
@@ -11,14 +11,14 @@ HOSTNAME="$(hostname --short)"
 
 sigh()
 {
-  echo "Good thing I asked; I won't $CMD $HOSTNAME ..."
+  echo "Good thing I asked; I won't $MOLLYGUARD_CMD $HOSTNAME ..." >&2
   exit 1
 }
 
 
 if /usr/bin/mythtv_recording_soon; then
   trap 'echo;sigh' 1 2 3 9 10 12 15
-  echo -n "MythTV is either recording now, or will be soon. Type YES to $CMD: "
+  echo -n "MythTV is either recording now, or will be soon. Type YES to $MOLLYGUARD_CMD: "
   read CONFIRM || :
 
   [ $(echo "x$CONFIRM" | tr 'A-Z' 'a-z') = "xyes" ] || sigh