diff options
| author | Aikar <[email protected]> | 2018-10-24 00:53:08 -0400 |
|---|---|---|
| committer | Aikar <[email protected]> | 2018-10-24 00:53:08 -0400 |
| commit | 9212632516c535dc3764329761aff82551334644 (patch) | |
| tree | c912a3631d677a166f255644f743e04e71cbcca5 /scripts | |
| parent | 5f7c6d0d2a932cd347c20c8e7fc2683a25b555d6 (diff) | |
| download | Paper-9212632516c535dc3764329761aff82551334644.tar.gz Paper-9212632516c535dc3764329761aff82551334644.zip | |
[CI-SKIP] make rebuildPatches support BSD sed
because the world can't be a nice place where all seds are equal
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/rebuildPatches.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/rebuildPatches.sh b/scripts/rebuildPatches.sh index f98ee8d09f..0cb4933de7 100755 --- a/scripts/rebuildPatches.sh +++ b/scripts/rebuildPatches.sh @@ -12,8 +12,8 @@ echo "Rebuilding patch files from current fork state..." function cleanupPatches { cd "$1" for patch in *.patch; do - sed -ri 's/index [a-f0-9]+\.\.[a-f0-9]+/index 7ac07ac07ac0..7ac07ac07ac0/g' "$patch" - sed -ri 's/^From [a-f0-9]{32,}/From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0/g' "$patch" + sed -Ei 's/index [a-f0-9]+\.\.[a-f0-9]+/index 7ac07ac07ac0..7ac07ac07ac0/g' "$patch" + sed -Ei 's/^From [a-f0-9]{32,}/From 7ac07ac07ac07ac07ac07ac07ac07ac07ac07ac0/g' "$patch" $gitcmd add -A $patch gitver=$(tail -n 2 "$patch" | grep -ve "^$" | tail -n 1) diffs=$($gitcmd diff --staged "$patch" | grep --color=none -E "^(\+|\-)" | grep --color=none -Ev "(From [a-f0-9]{32,}|\-\-\- a|\+\+\+ b|^.index)") |