From 564d45b5a55adeb48f69fdecb2bf4ed1f909850b Mon Sep 17 00:00:00 2001
From: Dan Cross <cross@gajendra.net>
Date: Tue, 22 Jul 2025 14:42:03 +0000
Subject: config: add $egrep

Introduce a new variable set in $PLAN9/config:
$egrep, which is conditionally set to either
`egrep` or `grep -E`, based on platform, and use
this when we want to invoke `egrep`.

This works around the endless warnings from GNU
grep stating that `egrep` is deprecated in favor
of `grep -E`, when run on e.g. Linux.
---
 src/cmd/auxstats/mkfile        |  2 +-
 src/cmd/devdraw/mkwsysrules.sh |  2 +-
 src/cmd/mkfile                 |  4 ++--
 src/cmd/rc/checkparse          | 10 +++++++++-
 src/mkfile                     |  2 +-
 5 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/cmd/auxstats/mkfile b/src/cmd/auxstats/mkfile
index 818e9d39..9ff0e65b 100644
--- a/src/cmd/auxstats/mkfile
+++ b/src/cmd/auxstats/mkfile
@@ -12,6 +12,6 @@ HFILES=\
 
 <$PLAN9/src/mkone
 
-KVM=`{if uname |egrep 'BSD' | egrep -v 'OpenBSD' >/dev/null; then echo -lkvm; fi}
+KVM=`{if uname | grep 'BSD' | grep -v 'OpenBSD' >/dev/null; then echo -lkvm; fi}
 LDFLAGS=$LDFLAGS $KVM
 
diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh
index 56dff55a..f41d173e 100644
--- a/src/cmd/devdraw/mkwsysrules.sh
+++ b/src/cmd/devdraw/mkwsysrules.sh
@@ -24,7 +24,7 @@ fi
 
 if [ "x$WSYSTYPE" = "x" ]; then
 	if [ "x`uname`" = "xDarwin" ]; then
-		if sw_vers | egrep 'ProductVersion:	(10\.[0-9]\.|10\.1[012])$' >/dev/null; then
+		if sw_vers | $egrep 'ProductVersion:	(10\.[0-9]\.|10\.1[012])$' >/dev/null; then
 			echo 1>&2 'OS X 10.12 and older are not supported'
 			exit 1
 		fi
diff --git a/src/cmd/mkfile b/src/cmd/mkfile
index 2d0c657e..ac98725a 100644
--- a/src/cmd/mkfile
+++ b/src/cmd/mkfile
@@ -1,11 +1,11 @@
 <$PLAN9/src/mkhdr
 
-TARG=`ls *.[cy] *.lx | egrep -v "\.tab\.c$|^x\." | sed 's/\.[cy]//; s/\.lx//'`
+TARG=`ls *.[cy] *.lx | $egrep -v "\.tab\.c$|^x\." | sed 's/\.[cy]//; s/\.lx//'`
 
 <$PLAN9/src/mkmany
 
 BUGGERED='CVS|faces|factotum|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
-DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` $FONTSRV
+DIRS=lex `ls -l |sed -n 's/^d.* //p' |$egrep -v "^($BUGGERED)$"|grep -v '^lex$'` $FONTSRV
 
 <$PLAN9/src/mkdirs
 
diff --git a/src/cmd/rc/checkparse b/src/cmd/rc/checkparse
index 0a1472b2..4ddd0910 100755
--- a/src/cmd/rc/checkparse
+++ b/src/cmd/rc/checkparse
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+egrep=egrep
+tag="${SYSNAME:-`uname`}"
+case "$tag" in
+*Linux*)
+	egrep='grep -E'
+	;;
+esac
+
 aflag=false
 if [ "$1" = -a ]; then
 	aflag=true
@@ -10,7 +18,7 @@ files="$@"
 if [ $# = 0 ]; then
 	files=$(echo ./test.rc;
 		grep -l '^#!/usr/local/plan9/bin/rc' /usr/local/plan9/bin/{*,*/*} 2>/dev/null;
-		grep -R -l '^#!/bin/rc' $HOME/pub/plan9 | egrep -v 'plan9/(lib/(oui|pci)|sys/man|sys/lib/man|sys/lib/scsicodes)' 2>/dev/null)
+		grep -R -l '^#!/bin/rc' $HOME/pub/plan9 | $egrep -v 'plan9/(lib/(oui|pci)|sys/man|sys/lib/man|sys/lib/scsicodes)' 2>/dev/null)
 fi
 
 for i in $files
diff --git a/src/mkfile b/src/mkfile
index d17ca6b6..c18109fe 100644
--- a/src/mkfile
+++ b/src/mkfile
@@ -1,7 +1,7 @@
 <mkhdr
 
 BUGGERED='fs|fmt|utf'
-LIBDIRS=`ls -ld lib* | sed -n 's/^d.* //p' |egrep -v "^lib($BUGGERED)$"`
+LIBDIRS=`ls -ld lib* | sed -n 's/^d.* //p' |$egrep -v "^lib($BUGGERED)$"`
 
 DIRS=\
 	$LIBDIRS\
-- 
cgit v1.2.3