diff options
author | Eduardo Chappa <chappa@washington.edu> | 2021-11-14 09:43:51 -0700 |
---|---|---|
committer | Eduardo Chappa <chappa@washington.edu> | 2021-11-16 08:35:13 -0700 |
commit | 45b271de27ca3a31e63ed182aebfe2b5f07d6874 (patch) | |
tree | fcaa5b8580e1e960012ebfe02ce0109e203f605e /contrib | |
parent | 216ad987323d8984de2dd9cccdf200a8f801d740 (diff) | |
download | alpine-45b271de27ca3a31e63ed182aebfe2b5f07d6874.tar.xz |
* Replace fgrep and grep -F and egrep by grep -E as these have been
deprecated. Patch submitted by Ville Skyttä.
Diffstat (limited to 'contrib')
-rw-r--r-- | contrib/ports/sequent_ptx_4.4.6 | 8 | ||||
-rwxr-xr-x | contrib/utils/mailtrfc.sh | 4 |
2 files changed, 6 insertions, 6 deletions
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.$$ |