mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 09:10:28 +00:00
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
(cherry picked from commit e27ded83c7
)
This commit is contained in:
parent
ab53efd142
commit
b562307b70
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue