From 45b271de27ca3a31e63ed182aebfe2b5f07d6874 Mon Sep 17 00:00:00 2001 From: Eduardo Chappa Date: Sun, 14 Nov 2021 09:43:51 -0700 Subject: * Replace fgrep and grep -F and egrep by grep -E as these have been deprecated. Patch submitted by Ville Skyttä. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- contrib/ports/sequent_ptx_4.4.6 | 8 ++++---- contrib/utils/mailtrfc.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'contrib') diff --git a/contrib/ports/sequent_ptx_4.4.6 b/contrib/ports/sequent_ptx_4.4.6 index c631fcd3..21ff3e35 100644 --- a/contrib/ports/sequent_ptx_4.4.6 +++ b/contrib/ports/sequent_ptx_4.4.6 @@ -129,16 +129,16 @@ diff -cr pine.dist/pine/mailtrfc.sh pine4.20/pine/mailtrfc.sh echo $host $org $domain | \ ! awk '{printf(" %.17s %.11s %.11s Off Campus Total\n", $1, $2, $3)}' - egrep -v 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn - egrep 'TOTAL|----' /tmp/syslogx.$$ + grep -Ev 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn + grep -E 'TOTAL|----' /tmp/syslogx.$$ grep '^-->' /tmp/syslogx.$$ | sed -e 's/-->//' > other-traffic --- 115,121 ---- echo $host $org $domain | \ ! nawk '{printf(" %.17s %.11s %.11s Off Campus Total\n", $1, $2, $3)}' - egrep -v 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn - egrep 'TOTAL|----' /tmp/syslogx.$$ + grep -Ev 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn + grep -E 'TOTAL|----' /tmp/syslogx.$$ grep '^-->' /tmp/syslogx.$$ | sed -e 's/-->//' > other-traffic diff -cr pine.dist/pine/send.c pine4.20/pine/send.c *** pine.dist/pine/send.c Wed Oct 6 16:18:27 1999 diff --git a/contrib/utils/mailtrfc.sh b/contrib/utils/mailtrfc.sh index 2ef69cdc..761df038 100755 --- a/contrib/utils/mailtrfc.sh +++ b/contrib/utils/mailtrfc.sh @@ -122,8 +122,8 @@ awk 'BEGIN {mailers[0] = "Other"; echo $host $org $domain | \ awk '{printf(" %.17s %.11s %.11s Off Campus Total\n", $1, $2, $3)}' -egrep -v 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn -egrep 'TOTAL|----' /tmp/syslogx.$$ +grep -Ev 'TOTAL|----|^-->' /tmp/syslogx.$$ | sort +0.60rn +grep -E 'TOTAL|----' /tmp/syslogx.$$ grep '^-->' /tmp/syslogx.$$ | sed -e 's/-->//' > other-traffic rm -f /tmp/syslogx.$$ -- cgit v1.2.3-70-g09d2