From cc875c00fe0ceb60250422d042283d92410f9df2 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 27 May 2018 11:39:59 +0100
Subject: [PATCH] Tidying
---
src/freedombone-utils-avahi | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/freedombone-utils-avahi b/src/freedombone-utils-avahi
index 848e23702..fcbeeae06 100755
--- a/src/freedombone-utils-avahi
+++ b/src/freedombone-utils-avahi
@@ -123,24 +123,20 @@ function mesh_avahi {
function keep_avahi_running {
WATCHDOG_SCRIPT_NAME="keepon"
- if [ ! -f "/usr/bin/$WATCHDOG_SCRIPT_NAME" ]; then
- { echo '#!/bin/bash';
- echo 'LOGFILE=/var/log/keepon.log';
- echo "CURRENT_DATE=\$(date)"; } > "/usr/bin/$WATCHDOG_SCRIPT_NAME"
+ if grep -q "avahi daemon" "/usr/bin/$WATCHDOG_SCRIPT_NAME"; then
+ return
fi
- if ! grep -q "avahi daemon" "/usr/bin/$WATCHDOG_SCRIPT_NAME"; then
- { echo '';
- echo '# keep avahi daemon running';
- echo "AVAHI_RUNNING=\$(systemctl is-active avahi-daemon >/dev/null 2>&1 && echo Running)";
- echo "if [ ! \$AVAHI_RUNNING ]; then";
- echo ' systemctl start avahi-daemon';
- echo " echo -n \$CURRENT_DATE >> \$LOGFILE";
- echo " echo \" Avahi daemon restarted\" >> \$LOGFILE";
- echo 'fi';
- echo '# End of avahi'; } >> "/usr/bin/$WATCHDOG_SCRIPT_NAME"
- chmod +x "/usr/bin/$WATCHDOG_SCRIPT_NAME"
- fi
+ { echo '';
+ echo '# keep avahi daemon running';
+ echo "AVAHI_RUNNING=\$(systemctl is-active avahi-daemon >/dev/null 2>&1 && echo Running)";
+ echo "if [ ! \$AVAHI_RUNNING ]; then";
+ echo ' systemctl start avahi-daemon';
+ echo " echo -n \$CURRENT_DATE >> \$LOGFILE";
+ echo " echo \" Avahi daemon restarted\" >> \$LOGFILE";
+ echo 'fi';
+ echo '# End of avahi'; } >> "/usr/bin/$WATCHDOG_SCRIPT_NAME"
+ chmod +x "/usr/bin/$WATCHDOG_SCRIPT_NAME"
}
function install_avahi {
--
GitLab