diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2023-03-02 23:54:52 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2023-03-06 00:30:57 +0000 |
| commit | b562307b70346030f59fe6a05d125814c74da47b (patch) | |
| tree | e6c81f7e269796329bf7e06edb1dc43788497d26 | |
| parent | ab53efd14237b71c3c0e4e212ada6526ef14402c (diff) | |
| download | src-b562307b70346030f59fe6a05d125814c74da47b.tar.gz src-b562307b70346030f59fe6a05d125814c74da47b.zip | |
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 e27ded83c76a609687a3d9e82b80fe7e1b782bf6)
| -rw-r--r-- | usr.sbin/freebsd-update/freebsd-update.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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 |