diff options
| author | Noah van der Aa <[email protected]> | 2021-12-20 23:46:51 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-12-20 22:46:51 +0000 |
| commit | ae6fec6d13255847ade2d54aa6462addbb1ad4d0 (patch) | |
| tree | 47d80db0bb562e275d9723a0dddd32f50cb7fcf1 /scripts | |
| parent | 6178609e1d7e9fda3d59786b69425a3b00d73298 (diff) | |
| download | Paper-ae6fec6d13255847ade2d54aa6462addbb1ad4d0.tar.gz Paper-ae6fec6d13255847ade2d54aa6462addbb1ad4d0.zip | |
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/apatch.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/apatch.sh b/scripts/apatch.sh index f56771d9ef..9156cb7cb9 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" |