|
 |
702687f |
diff --git a/fax/faxrunq.in b/fax/faxrunq.in
|
|
|
702687f |
index 75e9744..cc01a91 100644
|
|
|
702687f |
--- a/fax/faxrunq.in
|
|
|
702687f |
+++ b/fax/faxrunq.in
|
|
|
702687f |
@@ -177,17 +177,18 @@ do
|
|
 |
295243c |
# read job using 'tr', remove all quote characters, dollar, and backslash
|
|
|
295243c |
#
|
|
|
295243c |
eval `tr -d '\042\047\140\134\044\073'
|
|
|
295243c |
- $AWK 'BEGIN { user=""; mail=""; verbto=""; time=""; re=""; ah=""; }
|
|
|
702687f |
+ $AWK 'BEGIN { user=""; mail=""; verbto=""; time=""; time_to=""; re=""; ah=""; }
|
|
|
295243c |
$1=="user" { user=$2 }
|
|
|
295243c |
$1=="mail" { mail=substr( $0, 6) }
|
|
|
702687f |
$1=="phone" { printf "PHONE=\"%s\";", $2 }
|
|
|
295243c |
- $1=="time" { time=$2 }
|
|
|
295243c |
+ $1=="time" { time=substr($2,1,4); time_to=substr($2,6,4); }
|
|
|
295243c |
$1=="verbose_to" { verbto=substr($0,12) }
|
|
|
295243c |
$1=="subject" { re=substr($0,9) }
|
|
|
295243c |
$1=="acct_handle" { ah=substr($0,13) }
|
|
|
295243c |
END { if ( mail != "" ) printf "MAIL_TO=\"%s\";", mail
|
|
|
295243c |
else printf "MAIL_TO=\"%s\";", user
|
|
|
295243c |
printf "TIME=\"%s\";", time
|
|
|
295243c |
+ printf "TIME_TO=\"%s\";", time_to
|
|
|
295243c |
printf "VERBOSE_TO=\"%s\";", verbto
|
|
|
295243c |
printf "RE=\"%s\"; AH=\"%s\"", re, ah }' - `
|
|
|
295243c |
|
|
|
702687f |
@@ -196,11 +197,25 @@ do
|
|
|
295243c |
#
|
|
|
295243c |
if [ ! -z "$TIME" ]
|
|
|
295243c |
then
|
|
|
295243c |
- if [ `date "+%H""%M"` -lt $TIME ]
|
|
|
702687f |
+ if [ -z $TIME_TO ]
|
|
|
295243c |
then
|
|
|
295243c |
- $echo "...send time not reached, postponing job"
|
|
|
295243c |
- rm JOB.locked
|
|
|
295243c |
- continue
|
|
|
702687f |
+ TIME_TO="0000"
|
|
|
702687f |
+ fi
|
|
|
702687f |
+ if [ $TIME -lt $TIME_TO ]
|
|
|
702687f |
+ then
|
|
|
702687f |
+ if [ `date "+%H""%M"` -lt $TIME -o `date "+%H""%M"` -gt $TIME_TO ]
|
|
|
702687f |
+ then
|
|
|
702687f |
+ $echo "...send time not reached, postponing job"
|
|
|
702687f |
+ rm JOB.locked
|
|
|
702687f |
+ continue
|
|
|
702687f |
+ fi
|
|
|
702687f |
+ else
|
|
|
702687f |
+ if [ `date "+%H""%M"` -lt $TIME -o `date "+%H""%M"` -lt $TIME_TO ]
|
|
|
702687f |
+ then
|
|
|
702687f |
+ $echo "...send time not reached, postponing job"
|
|
|
702687f |
+ rm JOB.locked
|
|
|
702687f |
+ continue
|
|
|
702687f |
+ fi
|
|
|
295243c |
fi
|
|
|
295243c |
fi
|
|
|
295243c |
|