浏览代码

Fix hourly daemons

Bob Mottram 8 年前
父节点
当前提交
9ec20428da
共有 2 个文件被更改,包括 5 次插入3 次删除
  1. 2
    2
      src/freedombone-app-gnusocial
  2. 3
    1
      src/freedombone-app-postactiv

+ 2
- 2
src/freedombone-app-gnusocial 查看文件

@@ -225,8 +225,8 @@ function gnusocial_create_database {
225 225
 function gnusocial_running_script {
226 226
     # check that the daemon is running
227 227
     echo '#!/bin/bash' > /etc/cron.hourly/gnusocial-daemons
228
-    echo -n 'daemon_lines=$(ps aux | grep "'
229
-    echo -n "${GNUSOCIAL_DOMAIN_NAME}"
228
+    echo -n 'daemon_lines=$(ps aux | grep "'>> /etc/cron.hourly/gnusocial-daemons
229
+    echo -n "${GNUSOCIAL_DOMAIN_NAME}">> /etc/cron.hourly/gnusocial-daemons
230 230
     echo '/htdocs/scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/gnusocial-daemons
231 231
     echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/gnusocial-daemons
232 232
 

+ 3
- 1
src/freedombone-app-postactiv 查看文件

@@ -199,7 +199,9 @@ function postactiv_create_database {
199 199
 function postactiv_running_script {
200 200
     # check that the daemon is running
201 201
     echo '#!/bin/bash' > /etc/cron.hourly/postactiv-daemons
202
-    echo 'daemon_lines=$(ps aux | grep "${POSTACTIV_DOMAIN_NAME}/htdocs/scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/postactiv-daemons
202
+    echo -n 'daemon_lines=$(ps aux | grep "' >> /etc/cron.hourly/postactiv-daemons
203
+    echo -n "${POSTACTIV_DOMAIN_NAME}" >> /etc/cron.hourly/postactiv-daemons
204
+    echo '/htdocs/scripts/queuedaemon.php" | grep "/var/www")' >> /etc/cron.hourly/postactiv-daemons
203 205
     echo 'if [[ $daemon_lines != *"/var/www/"* ]]; then' >> /etc/cron.hourly/postactiv-daemons
204 206
 
205 207
     echo "    ADMIN_USER=\$(cat $COMPLETION_FILE | grep 'Admin user' | awk -F ':' '{print \$2}')" >> /etc/cron.hourly/postactiv-daemons