free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More exact match of daemon names

This commit is contained in:
Bob Mottram 2017-02-22 23:17:08 +00:00
parent 6ddaf16c5b
commit cc952a9c07
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/freedombone-app-gnusocial
View File

@ -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

2
src/freedombone-app-postactiv
View File

@ -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