Updated Upstream (Bukkit/CraftBukkit/Spigot) (#7116)

This commit is contained in:
Noah van der Aa
2021-12-20 23:46:51 +01:00
parent 8a5d6d18f8
commit eee1f6a0e0
19 changed files with 91 additions and 112 deletions

View File

@@ -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"