branch master updated: No egrep or fgrep

[Gavin D. Smith]

This is an automated email from the git hooks/post-receive script.

gavin pushed a commit to branch master
in repository texinfo.

The following commit(s) were added to refs/heads/master by this push:
     new 01e15ef  No egrep or fgrep
01e15ef is described below

commit 01e15efc09af0d9bdd65869917ee19e27fd8ca4b
Author: Gavin Smith <gavinsmith0123@gmail.com>
AuthorDate: Mon Nov 15 16:42:45 2021 +0000

    No egrep or fgrep
    
    * README-hacking, contrib/gen-dir-node,
    contrib/perldoc-all/GNUmakefile,install-info/tests/defs.in,
    util/texi2dvi:
    
    Change use of egrep and fgrep to grep -E and grep -F.
    'egrep' and 'fgrep' have been deprecated in GNU grep since
    2007, and in current post 3.7 Git they have been made to emit
    obsolescence warnings.
---
 ChangeLog                       | 13 +++++++++++++
 README-hacking                  |  2 +-
 contrib/gen-dir-node            |  6 +++---
 contrib/perldoc-all/GNUmakefile |  4 ++--
 install-info/tests/defs.in      |  5 ++---
 util/texi2dvi                   |  2 +-
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3fb238f..0517172 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2021-11-15 Ville Skyttä <ville.skytta@iki.fi>  (tiny change):
+
+       No egrep or fgrep
+
+       * README-hacking, contrib/gen-dir-node,
+       contrib/perldoc-all/GNUmakefile,install-info/tests/defs.in,
+       util/texi2dvi:
+
+       Change use of egrep and fgrep to grep -E and grep -F.
+       'egrep' and 'fgrep' have been deprecated in GNU grep since
+       2007, and in current post 3.7 Git they have been made to emit
+       obsolescence warnings.
+
 2021-11-01  Gavin Smith  <gavinsmith0123@gmail.com>
 
        * doc/texinfo.texi (\L, \l): Add definitions using European
diff --git a/README-hacking b/README-hacking
index d9139b5..453982f 100644
--- a/README-hacking
+++ b/README-hacking
@@ -295,7 +295,7 @@ gnupload --to ftp.gnu.org:texinfo !$
 update home page (texinfo.html) and commit as needed.
 including:
   pod2html $txi/Pod-Simple-Texinfo/pod2texi.pl \
-  | fgrep -v 'rev="made"' >manual/pod2texi.html
+  | grep -Fv 'rev="made"' >manual/pod2texi.html
 
 Build web documentation with
   make -C doc wwwdoc-build
diff --git a/contrib/gen-dir-node b/contrib/gen-dir-node
index 7b4bc02..8b413bb 100755
--- a/contrib/gen-dir-node
+++ b/contrib/gen-dir-node
@@ -78,7 +78,7 @@ moobler
 ### then generate entries for those in the same way, putting the info for 
 ### those at the end....
 
-infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*$' | egrep -v 
'^dir$|^dir\.info$|^dir\.orig$')`
+infofiles=`(cd ${INFODIR}; /bin/ls | grep -v '\-[0-9]*$' | grep -Ev 
'^dir$|^dir\.info$|^dir\.orig$')`
 
 # echoing gets clobbered by backquotes; we do it the hard way...
 lines=`wc $SKELETON | awk '{print $1}'`
@@ -165,8 +165,8 @@ fi
 
 # Sort remaining files by INFO-DIR-SECTION.
 prevsect=
-filesectdata=`(cd ${INFODIR}; fgrep INFO-DIR-SECTION /dev/null ${infofiles} | \
-             fgrep -v 'INFO-DIR-SECTION Miscellaneous' | \
+filesectdata=`(cd ${INFODIR}; grep -F INFO-DIR-SECTION /dev/null ${infofiles} 
| \
+             grep -Fv 'INFO-DIR-SECTION Miscellaneous' | \
              sort -t: -k2 -k1 | tr ' ' '_')`
 for sectdata in ${filesectdata}; do
   file=`echo ${sectdata} | cut -d: -f1`
diff --git a/contrib/perldoc-all/GNUmakefile b/contrib/perldoc-all/GNUmakefile
index 227a11c..f7fdde6 100644
--- a/contrib/perldoc-all/GNUmakefile
+++ b/contrib/perldoc-all/GNUmakefile
@@ -1,7 +1,7 @@
 # Makefile to build Texinfo from the Perl POD documentation,
 # using pod2texi.
 #
-# Copyright 2013-2019 Free Software Foundation, Inc.
+# Copyright 2013-2021 Free Software Foundation, Inc.
 # 
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -61,7 +61,7 @@ $(texi_pod_doc_incl): $(perl_pod_subdir)/*.pod
        cd $(perl_pod_subdir) \
        && perl -p -i.bak -e 's,X<.*?>>?,,g' *.pod \
        && $(pod2texi) -o $@ $(pod2texi_args) \
-         `ls *.pod | egrep -v "(delta|unicook)"` \
+         `ls *.pod | grep -Ev "(delta|unicook)"` \
        && mv $(texi_pod_subdir) $@ ../..
 
 # updating on www.gnu.org.  We do not install the split HTML files
diff --git a/install-info/tests/defs.in b/install-info/tests/defs.in
index c15fc73..73a68c7 100644
--- a/install-info/tests/defs.in
+++ b/install-info/tests/defs.in
@@ -1,6 +1,6 @@
 # @configure_input@
 # 
-# Copyright 2008-2019 Free Software Foundation, Inc.
+# Copyright 2008-2021 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -60,8 +60,7 @@ if test -z "$TMPDIR"; then
   export TMPDIR
 fi
 
-# In case someone pedantic insists on using grep -E.
-: ${EGREP=egrep}
+: ${EGREP=grep -E}
 
 # Systems which define $COMSPEC or $ComSpec use semicolons to separate
 # directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
diff --git a/util/texi2dvi b/util/texi2dvi
index 241ad68..47eb088 100755
--- a/util/texi2dvi
+++ b/util/texi2dvi
@@ -74,7 +74,7 @@ newline='
 '
 IFS="$space$tab$newline"
 
-: ${EGREP=egrep}
+: ${EGREP=grep -E}
 
 # Systems which define $COMSPEC or $ComSpec use semicolons to separate
 # directories in TEXINPUTS -- except for Cygwin and Msys, where COMSPEC