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

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

[Marcus B Spencer]

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 --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')
-- 
2.45.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/2] tests/fate/libswresample: suggest users `grep -E`

[Marcus B Spencer]

Suggest users to 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>
---
 tests/fate/libswresample.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate/libswresample.mak b/tests/fate/libswresample.mak
index a1e5ab91fa..0d3fd53405 100644
--- a/tests/fate/libswresample.mak
+++ b/tests/fate/libswresample.mak
@@ -25,7 +25,7 @@ endef
 
 #below list is generated by:
 #you can use this if you need to update it!
-#make -k  `make fate-list | grep swr` | egrep 'TEST|stddev' | tr '\n' '@' | sed 's#TEST *\([^@]*\)@stddev: *\([0-9.]*\)[^b@]*bytes: *\([0-9]*\) */ *\([0-9]*\)@#fate-\1: CMP_TARGET = \2@fate-\1: SIZE_TOLERANCE = \3 - \4@@#g' | tr '@' '\n'
+#make -k  `make fate-list | grep swr` | grep -E 'TEST|stddev' | tr '\n' '@' | sed 's#TEST *\([^@]*\)@stddev: *\([0-9.]*\)[^b@]*bytes: *\([0-9]*\) */ *\([0-9]*\)@#fate-\1: CMP_TARGET = \2@fate-\1: SIZE_TOLERANCE = \3 - \4@@#g' | tr '@' '\n'
 
 fate-swr-resample-dblp-2626-44100: CMP_TARGET = 1352.67
 fate-swr-resample-dblp-2626-44100: SIZE_TOLERANCE = 31512 - 20480
-- 
2.45.2

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".