d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add an option to make periodic(8) quiet when no output was generated.

Browse Source 
The man page part of the patch is my fault, the changes to the
periodic script is Dominik's.

PR:		88486
Submitted by:	Dominik Brettnacher <domi@saargate.de>
Reviewed by:	brian
Approved by:	re
MFC after:	1 month
This commit is contained in:
David Malone 2007-06-22 10:04:05 +00:00
parent c199bfa6cb
commit 68c35072f9
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/periodic/periodic.8
View File

@ -135,6 +135,11 @@ value does not begin with a
.Ql /
and is not empty, it is assumed to contain a list of email addresses, and
the output is mailed to them.
If
.Ao Ar basedir Ac Ns Va _show_empty_output
is set to
.Dq Li NO ,
then no mail will be sent if the output was empty.
.Pp
If
.Ao Ar basedir Ac Ns Va _output

13
usr.sbin/periodic/periodic.sh
View File

@ -40,11 +40,11 @@ do
case "$output" in
/*) pipe="cat >>$output";;
"") pipe=cat;;
*) pipe="mail -s '$host ${arg##*/} run output' $output";;
*) pipe="mail -E -s '$host ${arg##*/} run output' $output";;
esac
success=YES info=YES badconfig=NO # Defaults when ${run}_* aren't YES/NO
for var in success info badconfig
success=YES info=YES badconfig=NO empty_output=YES # Defaults when ${run}_* aren't YES/NO
for var in success info badconfig empty_output
do
case $(eval echo "\$${arg##*/}_show_$var") in
[Yy][Ee][Ss]) eval $var=YES;;
@ -95,8 +95,11 @@ do
done
if [ $empty = TRUE ]
then
[ $processed = 1 ] && plural= || plural=s
echo "No output from the $processed file$plural processed"
if [ $empty_output = TRUE ]
then
[ $processed = 1 ] && plural= || plural=s
echo "No output from the $processed file$plural processed"
fi
else
echo ""
echo "-- End of $arg output --"