Support the Fedora config file location in more scripts

diff --git a/ChangeLog b/ChangeLog
index 23b85ca195fbcfd9de226fe361cc30e544fdbb82..f2190c4b38217f57c926d52bbac9b5c53bc881a2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
 
   Provide, hopefully sane, defaults in health-check.
 
+  Support the Fedora config file for: health-check, mythtv_recording_now,
+  mythtv_recording_soon (not just mythtv-update-motd).
+
 2023-07-27  Andrew Ruthven
   Install the systemd files into the UsrMerge location so we'll work with
   more distributions, thanks to Göran Uddeborgfor pointing this out.

diff --git a/bin/health-check b/bin/health-check
index bbcda107907e6776cc3a3ccaf3a480c1133e0c24..636145768478f7b164858b39a4888b694c13ec66 100755 (executable)
--- a/bin/health-check
+++ b/bin/health-check
@@ -8,7 +8,10 @@
 #
 # Run mythtv-status to perform a health check of the MythTV system.
 
-. /etc/default/mythtv-status
+# Debian style
+[ -r /etc/default/mythtv-status ]   && . /etc/default/mythtv-status
+# Fedora style
+[ -r /etc/sysconfig/mythtv-status ] && . /etc/sysconfig/mythtv-status
 
 if [ "$EMAIL" = "none" ]
 then

diff --git a/bin/mythtv-update-motd b/bin/mythtv-update-motd
index 9f4cc5b890fb34b81bab25d4978b66986ecc5e22..be0042b8284d73c3f1038f4cdd7dddb16361722d 100755 (executable)
--- a/bin/mythtv-update-motd
+++ b/bin/mythtv-update-motd
@@ -11,7 +11,7 @@
 NAME=mythtv-update-motd
 
 # Debian style
-[ -r /etc/default/mythtv-status ] && . /etc/default/mythtv-status
+[ -r /etc/default/mythtv-status ]   && . /etc/default/mythtv-status
 # Fedora style
 [ -r /etc/sysconfig/mythtv-status ] && . /etc/sysconfig/mythtv-status
 

diff --git a/bin/mythtv_recording_now b/bin/mythtv_recording_now
index 331c4ea7c6104df7d22636f087e11c694beececb..62368a7a8af4e03a9f78800f3cc31ff6173c54b0 100755 (executable)
--- a/bin/mythtv_recording_now
+++ b/bin/mythtv_recording_now
@@ -9,11 +9,11 @@
 # Return an exit code of 0 if the MythTV backend is currently recording
 # a show.
 
-# Where Debian stores the config info.
-if [ -f /etc/default/mythtv-status ]
-then
-  . /etc/default/mythtv-status
-fi
+# Debian style
+[ -r /etc/default/mythtv-status ]   && . /etc/default/mythtv-status
+# Fedora style
+[ -r /etc/sysconfig/mythtv-status ] && . /etc/sysconfig/mythtv-status
+
 
 /usr/bin/mythtv-status -h "${HOST:-localhost}" --return-code-only --recording-now
 

diff --git a/bin/mythtv_recording_soon b/bin/mythtv_recording_soon
index e4d14671185343c8d2f42fe28242b23c52044842..65d1c6a1ad98196ac4fd6d5d08d6cc18e27c77f8 100755 (executable)
--- a/bin/mythtv_recording_soon
+++ b/bin/mythtv_recording_soon
@@ -9,11 +9,10 @@
 # Return an exit code of 0 if the MythTV backend is currently recording
 # a show or will be recording a show soon (in the next hour).
 
-# Where Debian stores the config info.
-if [ -f /etc/default/mythtv-status ]
-then
-  . /etc/default/mythtv-status
-fi
+# Debian style
+[ -r /etc/default/mythtv-status ]   && . /etc/default/mythtv-status
+# Fedora style
+[ -r /etc/sysconfig/mythtv-status ] && . /etc/sysconfig/mythtv-status
 
 if [ "x$1" != "x" ]
 then