git: 46a79e80414c - releng/13.2 - freebsd-update: use grep -E instead of egrep
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 06 Mar 2023 13:03:27 UTC
The branch releng/13.2 has been updated by emaste:
URL: https://cgit.FreeBSD.org/src/commit/?id=46a79e80414cdf9830c3afc402f3e4a6c24df6e9
commit 46a79e80414cdf9830c3afc402f3e4a6c24df6e9
Author: Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-03-02 23:54:52 +0000
Commit: Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-03-06 13:02:51 +0000
freebsd-update: use grep -E instead of egrep
GNU egrep emits a warning that it is obsolescent and suggests grep -E
instead. Switch to grep -E in case we end up invoking GNU (e)grep (and
for consistency with other invocations in this file).
Reported by: Steffen Nurpmeso
Approved by: re (cperciva)
Sponsored by: The FreeBSD Foundation
(cherry picked from commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6)
(cherry picked from commit b562307b70346030f59fe6a05d125814c74da47b)
---
usr.sbin/freebsd-update/freebsd-update.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/usr.sbin/freebsd-update/freebsd-update.sh b/usr.sbin/freebsd-update/freebsd-update.sh
index 225d1e31e3ec..4ef44d1ad000 100644
--- a/usr.sbin/freebsd-update/freebsd-update.sh
+++ b/usr.sbin/freebsd-update/freebsd-update.sh
@@ -2547,7 +2547,7 @@ manually...
read dummy </dev/tty
${EDITOR} `pwd`/merge/new/${F} < /dev/tty
- if ! egrep -q '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then
+ if ! grep -qE '^(<<<<<<<|=======|>>>>>>>)([[:space:]].*)?$' $(pwd)/merge/new/${F} ; then
break
fi
cat <<-EOF