scripts: use `grep -E` instead of `egrep`

egrep is deprecated

Closes #9491

diff --git a/.github/workflows/hacktoberfest-accepted.yml b/.github/workflows/hacktoberfest-accepted.yml
index fa1733938419028dc780521792af13b5e01ea9f0..cb84ed9892bbf4aacad99dc381c29ac9ece42739 100644 (file)
--- a/.github/workflows/hacktoberfest-accepted.yml
+++ b/.github/workflows/hacktoberfest-accepted.yml
@@ -36,15 +36,15 @@ jobs:
       - name: Search relevant commit message lines starting with Closes/Merges
         run: |
           git log --format=email ${{ github.event.before }}..${{ github.event.after }} | \
-            egrep -i "^Close[sd]? " | sort | uniq | tee log
+            grep -Ei "^Close[sd]? " | sort | uniq | tee log
         if: steps.check.outputs.label == 'hacktoberfest'
 
       - name: Search for Number-based PR references
         run: |
-          egrep -o "#([0-9]+)" log | cut -d# -f2 | sort | uniq | xargs -t -n1 -I{} \
+          grep -Eo "#([0-9]+)" log | cut -d# -f2 | sort | uniq | xargs -t -n1 -I{} \
             gh pr view {} --json number,createdAt \
               --jq '{number, opened: .createdAt} | [.number, .opened] | join(":")' | tee /dev/stderr | \
-            egrep -o '^([0-9]+):[0-9]{4}-(09-30T|10-|11-01T)' | cut -d: -f1 | sort | uniq | xargs -t -n1 -I {} \
+            grep -Eo '^([0-9]+):[0-9]{4}-(09-30T|10-|11-01T)' | cut -d: -f1 | sort | uniq | xargs -t -n1 -I {} \
               gh pr edit {} --add-label 'hacktoberfest-accepted'
         if: steps.check.outputs.label == 'hacktoberfest'
         env:
@@ -52,10 +52,10 @@ jobs:
 
       - name: Search for URL-based PR references
         run: |
-          egrep -o "github.com/(.+)/(.+)/pull/([0-9]+)" log | sort | uniq | xargs -t -n1 -I{} \
+          grep -Eo "github.com/(.+)/(.+)/pull/([0-9]+)" log | sort | uniq | xargs -t -n1 -I{} \
             gh pr view "https://{}" --json number,createdAt \
               --jq '{number, opened: .createdAt} | [.number, .opened] | join(":")' | tee /dev/stderr | \
-            egrep -o '^([0-9]+):[0-9]{4}-(09-30T|10-|11-01T)' | cut -d: -f1 | sort | uniq | xargs -t -n1 -I {} \
+            grep -Eo '^([0-9]+):[0-9]{4}-(09-30T|10-|11-01T)' | cut -d: -f1 | sort | uniq | xargs -t -n1 -I {} \
               gh pr edit {} --add-label 'hacktoberfest-accepted'
         if: steps.check.outputs.label == 'hacktoberfest'
         env:

diff --git a/.mailmap b/.mailmap
index 58102d0ac06be9379256844dbc5aa6e03a2ef104..5fe41e157490ec8911e428961c4732334bae38f1 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -95,3 +95,4 @@ rzrymiak on github <106121613+rzrymiak@users.noreply.github.com>
 Oliver Roberts <oliver@futaura.co.uk>
 opensignature on github <antonio@piumarossa.it>
 Cering on github <gfypm@qq.com>
+a1346054 on github <36859588+a1346054@users.noreply.github.com>

diff --git a/MacOSX-Framework b/MacOSX-Framework
index 97cd00b9bae4907d49372a77b3c92ed2e4196979..240eb845ebb053d75149bf865e4e309295f3422d 100755 (executable)
--- a/MacOSX-Framework
+++ b/MacOSX-Framework
@@ -83,12 +83,12 @@ if test $PPC64_NEEDED -gt 0
 then
   SDK64=10.5
   ARCHES64='-arch x86_64 -arch ppc64'
-  SDK64=`ls  $SDK_PATH|grep 10.5|head -1`
+  SDK64=`ls  $SDK_PATH | grep "10\.5" | head -1`
 else
  ARCHES64='-arch x86_64'
  #We "know" that 10.4 and earlier do not support 64bit
- OLD_SDK64=`ls  $SDK_PATH|egrep -v "10.[0-4]"|head -1`
- NEW_SDK64=`ls -r $SDK_PATH|egrep -v "10.[0-4][^0-9]" | head -1`
+ OLD_SDK64=`ls  $SDK_PATH | grep -v "10\.[0-4]" | head -1`
+ NEW_SDK64=`ls -r $SDK_PATH | grep -v "10\.[0-4][^0-9]" | head -1`
  if test $USE_OLD -gt 0
   then
    SDK64=$OLD_SDK64

diff --git a/scripts/contributors.sh b/scripts/contributors.sh
index 6be35d51dde6b1fb11ecf83515436613f99f4618..10dc8c433db7726da8ce86c8c2f32a9fe08c568b 100755 (executable)
--- a/scripts/contributors.sh
+++ b/scripts/contributors.sh
@@ -63,7 +63,7 @@ fi
    git -C ../curl-www log --pretty=full --use-mailmap $start..HEAD
   fi
  ) | \
-egrep -ai '(^Author|^Commit|by):' | \
+grep -Eai '(^Author|^Commit|by):' | \
 cut -d: -f2- | \
 cut '-d(' -f1 | \
 cut '-d<' -f1 | \

diff --git a/scripts/contrithanks.sh b/scripts/contrithanks.sh
index 38c7b89ef3fdf75f42e8d114d9bbf723343add7b..20b5cbf10c18011f4c8c5fccbad7ba1782163059 100755 (executable)
--- a/scripts/contrithanks.sh
+++ b/scripts/contrithanks.sh
@@ -55,7 +55,7 @@ cat ./docs/THANKS
   fi
  ) | \
 
-egrep -ai '(^Author|^Commit|by):' | \
+grep -Eai '(^Author|^Commit|by):' | \
 cut -d: -f2- | \
 cut '-d(' -f1 | \
 cut '-d<' -f1 | \