diff mbox series

[FFmpeg-devel,1/2] tools/murge, tools/patcheck: use `grep -E`

Message ID 20240718144858.11834-1-marcus@marcusspencer.xyz
State New
Headers show
Series [FFmpeg-devel,1/2] tools/murge, tools/patcheck: use `grep -E` | expand

Commit Message

Marcus B Spencer July 18, 2024, 2:48 p.m. UTC 
Use `grep -E` instead of egrep, because it is deprecated.

See common question #17 under
https://www.gnu.org/software/grep/manual/grep.html#Usage-1

Signed-off-by: Marcus B Spencer <marcus@marcusspencer.xyz>
---
 tools/murge    | 6 +++---
 tools/patcheck | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
diff mbox series

Patch

diff --git a/tools/murge b/tools/murge
index f22fcfda81..d43a19bb8b 100755
--- a/tools/murge
+++ b/tools/murge
@@ -1,9 +1,9 @@ 
 #!/bin/sh
 
 grep -A99999 '^<<<<<<<' | grep -B99999 '^>>>>>>>' >murge.X
-grep -A99999 '^====' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.theirs
-grep -B99999 '^||||' murge.X | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.ours
-grep -B99999 '^====' murge.X | grep -A99999 '^||||' | egrep -v '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)'  >murge.common
+grep -A99999 '^====' murge.X | grep -Ev '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.theirs
+grep -B99999 '^||||' murge.X | grep -Ev '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)' >murge.ours
+grep -B99999 '^====' murge.X | grep -A99999 '^||||' | grep -Ev '^(=======|<<<<<<<|>>>>>>>|\|\|\|\|\|\|\|)'  >murge.common
 
 colordiff -du $* murge.ours murge.theirs
 grep . murge.common > /dev/null && colordiff -du $* murge.common murge.theirs
diff --git a/tools/patcheck b/tools/patcheck
index 934e5b9451..ee310cdd07 100755
--- a/tools/patcheck
+++ b/tools/patcheck
@@ -9,7 +9,7 @@  if [ $# = 0 ]; then
 fi
 
 GREP=grep
-EGREP=egrep
+EGREP="$GREP -E"
 TMP=patcheck.tmp
 OPT="-nH"
 #FILES=$($GREP '^+++' $* | sed 's/+++ //g')