From cc952a9c07f3afb07d1c4d4ce1056eefcb91f8a1 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 22 Feb 2017 23:17:08 +0000 Subject: [PATCH] More exact match of daemon names --- src/freedombone-app-gnusocial | 2 +- src/freedombone-app-postactiv | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/freedombone-app-gnusocial b/src/freedombone-app-gnusocial index 03135ded..54567f0c 100755 --- a/src/freedombone-app-gnusocial +++ b/src/freedombone-app-gnusocial @@ -225,7 +225,7 @@ function gnusocial_create_database { function gnusocial_running_script { # check that the daemon is running echo '#!/bin/bash' > /etc/cron.hourly/gnusocial-daemons - echo 'daemon_lines=$(ps aux | grep "scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/gnusocial-daemons + echo 'daemon_lines=$(ps aux | grep "${GNUSOCIAL_DOMAIN_NAME}/htdocs/scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/gnusocial-daemons echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/gnusocial-daemons echo " ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')" >> /etc/cron.hourly/gnusocial-daemons diff --git a/src/freedombone-app-postactiv b/src/freedombone-app-postactiv index 4585b7cb..80e01cd1 100755 --- a/src/freedombone-app-postactiv +++ b/src/freedombone-app-postactiv @@ -199,7 +199,7 @@ function postactiv_create_database { function postactiv_running_script { # check that the daemon is running echo '#!/bin/bash' > /etc/cron.hourly/postactiv-daemons - echo 'daemon_lines=$(ps aux | grep "scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/postactiv-daemons + echo 'daemon_lines=$(ps aux | grep "${POSTACTIV_DOMAIN_NAME}/htdocs/scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/postactiv-daemons echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/postactiv-daemons echo " ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')" >> /etc/cron.hourly/postactiv-daemons