- reverse condition - "-q" was overwriting "-Q" if set both

[packages/awffull.git] / awffull.cron

diff --git a/awffull.cron b/awffull.cron
index 07a414d95c934aa4bb3c69b2e64ac05803db858e..4455e1f841aa9c5d0bf8f34b6b8ea808fbdcb305 100644 (file)
--- a/awffull.cron
+++ b/awffull.cron
@@ -10,25 +10,26 @@ if [ -n "$ENABLE" ] && [ "$ENABLE" = "yes" -o "$ENABLE" = "YES" ]; then
        export LANG
        export LC_ALL
        
-       if [ -n "$REALLY_QUIET" ] && [ "$REALLY_QUIET" = "yes" -o "$REALLY_QUIET" = "YES" ]; then
-               AWFFULL_OPTS="-Q"
-       elif [ -n "$QUIET" ] && [ "$QUIET" = "yes" -o "$QUIET" = "YES" ]; then
+       if [ -n "$QUIET" ] && [ "$QUIET" = "yes" -o "$QUIET" = "YES" ]; then
                AWFFULL_OPTS="-q"
+       elif [ -n "$REALLY_QUIET" ] && [ "$REALLY_QUIET" = "yes" -o "$REALLY_QUIET" = "YES" ]; then
+               AWFFULL_OPTS="-Q"
        fi
        
-       if [ -f /etc/awffull.conf ]; then
-               CONFIG_LIST="/etc/awffull.conf"
-       fi
        if [ -n "$MULTIPLE" ] && [ "$MULTIPLE" = "yes" -o "$MULTIPLE" = "YES" ]; then
                for config in $(ls /etc/awffull/*.conf 2>/dev/null); do\
                        CONFIG_LIST="${CONFIG_LIST} ${config}"
                done
+       else
+               CONFIG_LIST="/etc/awffull.conf"
        fi
+
        for singleconfig in ${CONFIG_LIST}; do
                if [ -n "${USE_DNSHISTORY}" ] && [ "${USE_DNSHISTORY}" = "yes" -o "${USE_DNSHISTORY}" = "YES" ]; then
-                       TMPCONFIG=`mktemp -q /var/lib/dnshistory.XXXXXX`
+                       TMPCONFIG=`mktemp -q /var/lib/dnshistory/awffull_config.XXXXXX`
                        LOGFILE=`grep ^LogFile ${singleconfig} | awk '{ print $2;}'`
-                       grep ^LogFile ${singleconfig} > ${TMPCONFIG}
+                       grep -v ^LogFile ${singleconfig} > ${TMPCONFIG}
+                       dnshistory -f ${LOGFILE}
                        dnshistory -T -f ${LOGFILE} | awffull ${AWFFULL_OPTS} -c ${TMPCONFIG} - ;
                        rm -f ${TMPCONFIG}
                else