From d6bfbc0a810fb40a2052477080921f843f7a1db6 Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Tue, 25 Jun 2013 16:16:11 +0300 Subject: [PATCH] common paths for crontab --- func/main.sh | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/func/main.sh b/func/main.sh index 0f3bc6abb..a1f1198c4 100644 --- a/func/main.sh +++ b/func/main.sh @@ -473,16 +473,22 @@ sort_cron_jobs() { # Sync cronjobs with system cron sync_cron_jobs() { source $USER_DATA/user.conf - rm -f /var/spool/cron/$user + + if [ -e "/var/spool/cron/crontabs" ]; then + sys_cron="/var/spool/cron/crontabs/$user" + else + sys_cron="/var/spool/cron/$user" + fi + rm -f $sys_cron if [ "$CRON_REPORTS" = 'yes' ]; then - echo "MAILTO=$CONTACT" > /var/spool/cron/$user + echo "MAILTO=$CONTACT" > $sys_cron fi while read line; do eval $line if [ "$SUSPENDED" = 'no' ]; then echo "$MIN $HOUR $DAY $MONTH $WDAY $CMD" |\ sed -e "s/%quote%/'/g" -e "s/%dots%/:/g" \ - >> /var/spool/cron/$user + >> $sys_cron fi done < $USER_DATA/cron.conf }