[8/8] contrib: use grep -E instead of egrep
Commit Message
egrep has been deprecated in favor of grep -E for a long time, and the
next grep release (3.8 or 4.0) will print a warning of egrep is used.
Stop using egrep so we won't see the warning.
contrib/ChangeLog:
* check_GNU_style.sh: Use grep -E instead of egrep.
* test_summary: Likewise.
* warn_summary: Likewise.
---
contrib/check_GNU_style.sh | 10 +++++-----
contrib/test_summary | 2 +-
contrib/warn_summary | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
@@ -113,7 +113,7 @@ g (){
local found=false
cat $inp \
- | egrep $color -- "$arg" \
+ | grep -E $color -- "$arg" \
> "$tmp" && found=true
if $found; then
@@ -130,8 +130,8 @@ ag (){
local found=false
cat $inp \
- | egrep $color -- "$arg1" \
- | egrep $color -- "$arg2" \
+ | grep -E $color -- "$arg1" \
+ | grep -E $color -- "$arg2" \
> "$tmp" && found=true
if $found; then
@@ -148,8 +148,8 @@ vg (){
local found=false
cat $inp \
- | egrep -v -- "$varg" \
- | egrep $color -- "$arg" \
+ | grep -E -v -- "$varg" \
+ | grep -E $color -- "$arg" \
> "$tmp" && found=true
if $found; then
@@ -77,7 +77,7 @@ for file in $files; do
{ $anychange ||
anychange=`diff $file.sent $file 2>/dev/null |
if test ! -f $file.sent ||
- egrep '^[<>] (XPASS|FAIL)' >/dev/null; then
+ grep -E '^[<>] (XPASS|FAIL)' >/dev/null; then
echo true
else
echo false
@@ -57,7 +57,7 @@ subdirectoryFilter()
else
if test "$filter" = nosub ; then
# Omit all subdirectories.
- egrep -v '/gcc/(ch|cp|f|fortran|ada|intl|fixinc)/'
+ grep -E -v '/gcc/(ch|cp|f|fortran|ada|intl|fixinc)/'
else
# Pass through only subdir $filter.
grep "/gcc/$filter/"