commit:     76e219513367c692e7d46082ec5a6772e41edec0
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May  7 06:46:30 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 16 23:25:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76e21951

epatch.eclass: egrep -> grep -E

Deprecated for a while but newer grep emits deprecation warnings.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 eclass/epatch.eclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eclass/epatch.eclass b/eclass/epatch.eclass
index 5d18befe55b9..6a9c460da0a3 100644
--- a/eclass/epatch.eclass
+++ b/eclass/epatch.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: epatch.eclass
@@ -285,13 +285,13 @@ epatch() {
                # people could (accidently) patch files in the root filesystem.
                # Or trigger other unpleasantries #237667.  So disallow -p0 on
                # such patches.
-               local abs_paths=$(egrep -n '^[-+]{3} /' "${PATCH_TARGET}" | awk 
'$2 != "/dev/null" { print }')
+               local abs_paths=$(grep -E -n '^[-+]{3} /' "${PATCH_TARGET}" | 
awk '$2 != "/dev/null" { print }')
                if [[ -n ${abs_paths} ]] ; then
                        count=1
                        printf "NOTE: skipping -p0 due to absolute paths in 
patch:\n%s\n" "${abs_paths}" >> "${STDERR_TARGET}"
                fi
                # Similar reason, but with relative paths.
-               local rel_paths=$(egrep -n '^[-+]{3} [^ ]*[.][.]/' 
"${PATCH_TARGET}")
+               local rel_paths=$(grep -E -n '^[-+]{3} [^       ]*[.][.]/' 
"${PATCH_TARGET}")
                if [[ -n ${rel_paths} ]] ; then
                        echo
                        eerror "Rejected Patch: ${patchname}!"

Reply via email to