From 2464b9f47c730a0ceb4dd2865f68476a52c768ad Mon Sep 17 00:00:00 2001 From: Serghey Rodin Date: Sun, 14 Aug 2011 15:21:26 +0300 Subject: [PATCH] renamed crontab.conf to cron.conf --- bin/v_add_sys_cron | 2 +- bin/v_add_sys_user | 2 +- bin/v_change_sys_cron_job | 2 +- bin/v_list_sys_cron | 2 +- bin/v_suspend_sys_cron_jobs | 2 +- bin/v_unsuspend_sys_cron_jobs | 2 +- func/cron_func.sh | 22 +++++++++++----------- func/domain_func.sh | 4 ++-- 8 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bin/v_add_sys_cron b/bin/v_add_sys_cron index 495a2149..81ddba59 100755 --- a/bin/v_add_sys_cron +++ b/bin/v_add_sys_cron @@ -59,7 +59,7 @@ v_str="JOB='$job' MIN='$min' HOUR='$hour' DAY='$day' MONTH='$month" v_str="$v_str' WDAY='$wday' CMD='$command' SUSPEND='no' DATE='$V_DATE'" # Adding to crontab -echo "$v_str">>$V_USERS/$user/crontab.conf +echo "$v_str">>$V_USERS/$user/cron.conf # Sorting jobs by id sort_cron_jobs diff --git a/bin/v_add_sys_user b/bin/v_add_sys_user index 194408c1..df44c033 100755 --- a/bin/v_add_sys_user +++ b/bin/v_add_sys_user @@ -140,7 +140,7 @@ if [ ! -z "$DB_SYSTEM" ] && [ "$DB_SYSTEM" != 'no' ]; then fi if [ ! -z "$CRON_SYSTEM" ] && [ "$CRON_SYSTEM" != 'no' ]; then - touch $V_USERS/$user/crontab.conf + touch $V_USERS/$user/cron.conf fi if [ ! -z "$BACKUP_SYSTEM" ] && [ "$BACKUP_SYSTEM" != 'no' ]; then diff --git a/bin/v_change_sys_cron_job b/bin/v_change_sys_cron_job index f0db5f12..c63a486e 100755 --- a/bin/v_change_sys_cron_job +++ b/bin/v_change_sys_cron_job @@ -59,7 +59,7 @@ v_str="$v_str MONTH='$month' DAY='$day' CMD='$command' SUSPEND='no'" del_cron_job # Adding to crontab -echo "$v_str">>$V_USERS/$user/crontab.conf +echo "$v_str">>$V_USERS/$user/cron.conf # Sorting jobs by id sort_cron_jobs diff --git a/bin/v_list_sys_cron b/bin/v_list_sys_cron index ec1f69a5..13850602 100755 --- a/bin/v_list_sys_cron +++ b/bin/v_list_sys_cron @@ -36,7 +36,7 @@ is_user_valid #----------------------------------------------------------# # Defining config -conf="$V_USERS/$user/crontab.conf" +conf="$V_USERS/$user/cron.conf" # Defining fileds to select fields='$JOB $MIN $HOUR $DAY $MONTH $WDAY $CMD $SUSPEND $DATE' diff --git a/bin/v_suspend_sys_cron_jobs b/bin/v_suspend_sys_cron_jobs index 323bb62f..099e2f86 100755 --- a/bin/v_suspend_sys_cron_jobs +++ b/bin/v_suspend_sys_cron_jobs @@ -33,7 +33,7 @@ is_user_valid #----------------------------------------------------------# # Searching jobs -conf="$V_USERS/$user/crontab.conf" +conf="$V_USERS/$user/cron.conf" field='$JOB' search_string="SUSPEND='no'" jobs=$(cron_clear_search) diff --git a/bin/v_unsuspend_sys_cron_jobs b/bin/v_unsuspend_sys_cron_jobs index 0046a181..6e7437e7 100755 --- a/bin/v_unsuspend_sys_cron_jobs +++ b/bin/v_unsuspend_sys_cron_jobs @@ -33,7 +33,7 @@ is_user_valid #----------------------------------------------------------# # Searching jobs -conf="$V_USERS/$user/crontab.conf" +conf="$V_USERS/$user/cron.conf" field='$JOB' search_string="SUSPEND='yes'" jobs=$(cron_clear_search) diff --git a/func/cron_func.sh b/func/cron_func.sh index 0b78796a..36faaa47 100644 --- a/func/cron_func.sh +++ b/func/cron_func.sh @@ -1,6 +1,6 @@ get_next_cron_string() { # Parsing config - curr_str=$(grep "JOB=" $V_USERS/$user/crontab.conf|cut -f 2 -d \'|\ + curr_str=$(grep "JOB=" $V_USERS/$user/cron.conf|cut -f 2 -d \'|\ sort -n|tail -n1) # Print result @@ -9,7 +9,7 @@ get_next_cron_string() { is_cron_job_free() { # Checking record id - check_job=$(grep "JOB='$job'" $V_USERS/$user/crontab.conf) + check_job=$(grep "JOB='$job'" $V_USERS/$user/cron.conf) if [ ! -z "$check_job" ]; then echo "Error: job exist" @@ -20,7 +20,7 @@ is_cron_job_free() { sort_cron_jobs() { # Defining conf - conf="$V_USERS/$user/crontab.conf" + conf="$V_USERS/$user/cron.conf" cat $conf |sort -n -k 2 -t \' >$conf.tmp mv -f $conf.tmp $conf } @@ -38,7 +38,7 @@ sync_cron_jobs() { echo "MAILTO=$email" >$conf fi - # Reading user crontab.conf + # Reading user cron.conf while read line ; do # Defining new delimeter IFS=$'\n' @@ -53,12 +53,12 @@ sync_cron_jobs() { echo "$MIN $HOUR $DAY $MONTH $WDAY $CMD" |\ sed -e "s/%quote%/'/g" -e "s/%dots%/:/g" >> $conf fi - done <$V_USERS/$user/crontab.conf + done <$V_USERS/$user/cron.conf } is_job_valid() { - result=$(grep "JOB='$job'" $V_USERS/$user/crontab.conf) + result=$(grep "JOB='$job'" $V_USERS/$user/cron.conf) if [ -z "$result" ]; then echo "Error: job not exists" @@ -68,8 +68,8 @@ is_job_valid() { } del_cron_job() { - str=$(grep -n "JOB='$job'" $V_USERS/$user/crontab.conf|cut -f 1 -d :) - sed -i "$str d" $V_USERS/$user/crontab.conf + str=$(grep -n "JOB='$job'" $V_USERS/$user/cron.conf|cut -f 1 -d :) + sed -i "$str d" $V_USERS/$user/cron.conf } crn_json_list() { @@ -163,7 +163,7 @@ crn_shell_list() { is_job_suspended() { # Parsing jobs - str=$(grep "JOB='$job'" $V_USERS/$user/crontab.conf|grep "SUSPEND='yes'" ) + str=$(grep "JOB='$job'" $V_USERS/$user/cron.conf|grep "SUSPEND='yes'" ) # Checkng key if [ ! -z "$str" ]; then @@ -175,7 +175,7 @@ is_job_suspended() { is_job_unsuspended() { # Parsing jobs - str=$(grep "JOB='$job'" $V_USERS/$user/crontab.conf|grep "SUSPEND='no'" ) + str=$(grep "JOB='$job'" $V_USERS/$user/cron.conf|grep "SUSPEND='no'" ) # Checkng key if [ ! -z "$str" ]; then @@ -190,7 +190,7 @@ update_cron_job_value() { value="$2" # Defining conf - conf="$V_USERS/$user/crontab.conf" + conf="$V_USERS/$user/cron.conf" # Parsing conf job_str=$(grep -n "JOB='$job'" $conf) diff --git a/func/domain_func.sh b/func/domain_func.sh index ee3dac58..438b2881 100644 --- a/func/domain_func.sh +++ b/func/domain_func.sh @@ -5,11 +5,11 @@ is_domain_new() { # Parsing domain values check_domain=$(grep -F "DOMAIN='$search_dom'" $V_USERS/*/*.conf| \ - grep -v crontab.conf) + grep -v cron.conf) # Parsing alias values check_alias=$(grep -F 'ALIAS=' $V_USERS/*/*.conf | \ - grep -v crontab.conf | \ + grep -v cron.conf | \ awk -F "ALIAS=" '{print $2}' | \ cut -f 2 -d \' | \ sed -e "s/,/\n/g" | \