The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e27ded83c76a609687a3d9e82b80fe7e1b782bf6
commit e27ded83c76a609687a3d9e82b80fe7e1b782bf6 Author: Ed Maste <[email protected]> AuthorDate: 2023-03-02 23:54:52 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2023-03-02 23:58:58 +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 Sponsored by: The FreeBSD Foundation --- 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
