From eed98f9da2869f8b1b817a9e5978882c06f48e58 Mon Sep 17 00:00:00 2001 From: Ryan MacDonald Date: Sat, 1 Sep 2018 13:45:58 -0500 Subject: [PATCH] [Change] improve regexp of scan start time values for '-e|--list' output --- CHANGELOG | 1 + CHANGELOG.RELEASE | 1 + files/internals/functions | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index b9d8c0b..0643a49 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,7 @@ v1.6.3 | Sep 01 2018: [Change] cleanup .tgz/.md5 files on version updates mid-flight to prevent potential 'cd: too many arguments' errors [Change] trim inotify log from beginning instead of end of file; pr #292 [Change] user mode scanning no longer scans system temporary paths; issue #283 +[Change] improve regexp of scan start time values for '-e|--list' output [Change] added '--beta' flag to '-d|--update-ver' to support pulling down beta release of LMD [Change] stage v1.6.3 release; update version and date stamps [Kudos] Thank you to those that contributed pull requests and issues during this release cycle. PR contributions from: diff --git a/CHANGELOG.RELEASE b/CHANGELOG.RELEASE index 3f18f89..89dab80 100644 --- a/CHANGELOG.RELEASE +++ b/CHANGELOG.RELEASE @@ -18,6 +18,7 @@ v1.6.3 | Sep 01 2018: [Change] cleanup .tgz/.md5 files on version updates mid-flight to prevent potential 'cd: too many arguments' errors [Change] trim inotify log from beginning instead of end of file; pr #292 [Change] user mode scanning no longer scans system temporary paths; issue #283 +[Change] improve regexp of scan start time values for '-e|--list' output [Change] added '--beta' flag to '-d|--update-ver' to support pulling down beta release of LMD [Change] stage v1.6.3 release; update version and date stamps [Kudos] Thank you to those that contributed pull requests and issues during this release cycle. PR contributions from: diff --git a/files/internals/functions b/files/internals/functions index 6a1cf54..4002388 100644 --- a/files/internals/functions +++ b/files/internals/functions @@ -631,7 +631,7 @@ view_report() { FILES=`cat $file | grep "TOTAL FILES" | sed 's/TOTAL //'` HITS=`cat $file | grep "TOTAL HITS" | sed 's/TOTAL //'` CLEAN=`cat $file | grep "TOTAL CLEANED" | sed 's/TOTAL //'` - TIME=`cat $file | grep -iE "TIME|STARTED" | sed -e 's/TIME: //' -e 's/STARTED: //' | awk '{print$1,$2,$3,$4}'` + TIME=`cat $file | grep -E "^TIME|^STARTED" | sed -e 's/TIME: //' -e 's/STARTED: //' | awk '{print$1,$2,$3,$4}'` TIME_U=`date -d "$TIME" "+%s" 2> /dev/null` ETIME=`cat $file | grep "ELAPSED" | awk '{print$1,$2}' | sed 's/ELAPSED/RUNTIME/'` if [ ! -z "$SCANID" ] && [ ! -z "$TIME" ]; then