make-stds.texi egrep/fgrep update in Gnulib

make-stds.texi egrep/fgrep update in Gnulib

[Paul Eggert]

[-- Attachment #1: Type: text/plain, Size: 1034 bytes --]

Karl, I see that I messed up in June, and committed a make-stds.texi 
change to a vendor branch in Savannah's CVS repository for gnustandards, 
as opposed to doing it in the main branch. (My knowledge of CVS is no 
longer what it was, and I wish Savannah would switch to Git, but I 
digress...). This was the patch to remove egrep and fgrep from the list 
of portable tools, discussed here:

https://lists.gnu.org/archive/html/bug-standards/2022-06/msg00002.html

Because of my mistake, since then when I ran Gnulib autoupdate I 
installed the vendor-branch version, whereas when you ran autoupdate you 
installed the main version. We've had dueling updates.

I just now fixed the glitch by installing the make-stds.texi change into 
gnustandards here:

https://cvs.savannah.gnu.org/viewvc/gnustandards/gnustandards/make-stds.texi?r1=1.69&r2=1.70

and propagating this into Gnulib as follows (also attached):

https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=dda9eee96e18bdbfac023bdd1598e57a88f532ad

Sorry about the confusion.

[-- Attachment #2: 0001-autoupdate.patch --]
[-- Type: text/x-patch, Size: 1124 bytes --]

From dda9eee96e18bdbfac023bdd1598e57a88f532ad Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 13 Nov 2022 10:44:49 -0800
Subject: [PATCH] autoupdate

---
 doc/make-stds.texi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/make-stds.texi b/doc/make-stds.texi
index b0745a8a3e..132476c7a3 100644
--- a/doc/make-stds.texi
+++ b/doc/make-stds.texi
@@ -160,7 +160,7 @@ installation should not use any utilities directly except these:
 @c mkfifo mknod tee uname
 
 @example
-awk cat cmp cp diff echo egrep expr false grep install-info ln ls
+awk cat cmp cp diff echo expr false grep install-info ln ls
 mkdir mv printf pwd rm rmdir sed sleep sort tar test touch tr true
 @end example
 
@@ -1135,7 +1135,7 @@ programs except for these:
 
 @example
 [ basename bash cat chgrp chmod chown cmp cp dd diff echo
-egrep expand expr false fgrep find getopt grep gunzip gzip
+expand expr false find getopt grep gunzip gzip
 hostname install install-info kill ldconfig ln ls md5sum
 mkdir mkfifo mknod mv printenv pwd rm rmdir sed sort tee
 test touch true uname xargs yes
-- 
2.37.2