From a6a6a3db2449bcdbeafc92686f9baa09f5a5fb88 Mon Sep 17 00:00:00 2001 From: Jason Penilla <11360596+jpenilla@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:54:51 -0800 Subject: [ci skip] Revert change to apatch script --- scripts/apatch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/apatch.sh b/scripts/apatch.sh index 9156cb7cb9..f56771d9ef 100755 --- a/scripts/apatch.sh +++ b/scripts/apatch.sh @@ -40,7 +40,7 @@ fi for i in $(find . -name \*.rej); do base=$(echo "$i" | sed 's/.rej//g') if [ -f "$i" ]; then - sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i '' $i && wiggle -v -l --replace "$base" "$i" + sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i $i && wiggle -v -l --replace "$base" "$i" rm "$base.porig" "$i" else echo "No such file: $base" -- cgit v1.2.3