system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-09-06 09:10:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

freebsd-update: use grep -E instead of egrep

Browse source 
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

(cherry picked from commit e27ded83c7)
This commit is contained in:
Ed Maste 2023-03-02 18:54:52 -05:00
parent ab53efd142
commit b562307b70
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr.sbin/freebsd-update/freebsd-update.sh
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