[Logcheck-commits] CVS logcheck/src
CVS User alfie
logcheck-devel@lists.alioth.debian.org
Fri, 05 Nov 2004 04:10:58 -0700
Update of /cvsroot/logcheck/logcheck/src
In directory haydn:/tmp/cvs-serv27632/src
Modified Files:
logcheck
Log Message:
Fixed my non-fix in logcheck, sorry (closes: #279635)
--- /cvsroot/logcheck/logcheck/src/logcheck 2004/11/03 21:55:43 1.97
+++ /cvsroot/logcheck/logcheck/src/logcheck 2004/11/05 11:10:58 1.98
@@ -22,7 +22,7 @@
# along with Logcheck; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-# $Id: logcheck,v 1.97 2004/11/03 21:55:43 maks-guest Exp $
+# $Id: logcheck,v 1.98 2004/11/05 11:10:58 alfie Exp $
if [ $UID == 0 ]; then
echo "logcheck should not be run as root. Use su to invoke logcheck:"
@@ -188,7 +188,7 @@
if [ -f ${dir}/${rulefile} ]; then
debug "cleanrules: ${dir}/${rulefile}"
# pipe to cat on greps to get usable exit status
- egrep --text -v '^[[:space:]]\+$|^#' $dir/$rulefile | cat \
+ egrep --text -v '^[[:space:]]*$|^#' $dir/$rulefile | cat \
>> $cleaned/$rulefile \
|| error "Couldn't append to $cleaned/$rulefile. Disk Full?"
fi
@@ -615,7 +615,7 @@
mkdir $TMPDIR/logoutput \
|| error "Could not mkdir for log files"
if [ ! $LOGFILE ]; then
- for file in $(egrep --text -v "(^#|^[[:space:]]\+$)" $LOGFILES_LIST); do
+ for file in $(egrep --text -v "(^#|^[[:space:]]*$)" $LOGFILES_LIST); do
logoutput "$file"
done
elif [ $LOGFILE ]; then