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

This commit is contained in:

Ed Maste

2023-03-02 18:54:52 -05:00

parent 3518a5bbd9

commit e27ded83c7

1 changed files with 1 additions and 1 deletions

									
										usr.sbin/freebsd-update/freebsd-update.sh
									
		+1
		-1
	
												View File
												
				@@ -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