From 9780f3fb16e5f372451a62fa33fe07d8e0adfc45 Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Mon, 12 Sep 2022 20:21:03 +0000 Subject: [PATCH 1/2] scripts: use `grep -E` instead of `egrep` --- MacOSX-Framework | 6 +++--- scripts/contributors.sh | 2 +- scripts/contrithanks.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MacOSX-Framework b/MacOSX-Framework index 97cd00b9bae490..240eb845ebb053 100755 --- 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 6be35d51dde6b1..10dc8c433db772 100755 --- 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 38c7b89ef3fdf7..20b5cbf10c1801 100755 --- 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 | \ From ab434eaa83d077d41159908408afa3585581b6b2 Mon Sep 17 00:00:00 2001 From: a1346054 <36859588+a1346054@users.noreply.github.com> Date: Mon, 12 Sep 2022 23:52:58 +0000 Subject: [PATCH 2/2] hacktoberfest-accepted.yml: use `grep -E` instead of `egrep` --- .github/workflows/hacktoberfest-accepted.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/hacktoberfest-accepted.yml b/.github/workflows/hacktoberfest-accepted.yml index fa173393841902..cb84ed9892bbf4 100644 --- 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: