Paper/scripts/rebuildPatches.sh

65 lines
1.9 KiB
Bash
Raw Normal View History

2016-04-02 05:55:54 +02:00
#!/usr/bin/env bash
(
PS1="$"
basedir="$(cd "$1" && pwd -P)"
2016-04-02 05:55:54 +02:00
workdir="$basedir/work"
gitcmd="git -c commit.gpgsign=false -c core.safecrlf=false"
echo "Rebuilding patch files from current fork state..."
function cleanupPatches {
cd "$1"
for patch in *.patch; do
2016-03-01 00:09:49 +01:00
echo "$patch"
2016-04-02 05:55:54 +02:00
gitver=$(tail -n 2 "$patch" | grep -ve "^$" | tail -n 1)
diffs=$($gitcmd diff --staged "$patch" | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)")
testver=$(echo "$diffs" | tail -n 2 | grep -ve "^$" | tail -n 1 | grep "$gitver")
if [ "x$testver" != "x" ]; then
2016-03-01 00:09:49 +01:00
diffs=$(echo "$diffs" | sed 'N;$!P;$!D;$d')
fi
if [ "x$diffs" == "x" ] ; then
$gitcmd reset HEAD "$patch" >/dev/null
$gitcmd checkout -- "$patch" >/dev/null
fi
done
}
function savePatches {
what=$1
2016-04-02 05:55:54 +02:00
what_name=$(basename "$what")
target=$2
2016-03-01 00:09:49 +01:00
echo "Formatting patches for $what..."
cd "$basedir/${what_name}-Patches/"
2016-05-12 04:07:46 +02:00
if [ -d "$basedir/$target/.git/rebase-apply" ]; then
# in middle of a rebase, be smarter
echo "REBASE DETECTED - PARTIAL SAVE"
last=$(cat "$basedir/$target/.git/rebase-apply/last")
next=$(cat "$basedir/$target/.git/rebase-apply/next")
orderedfiles=$(find . -name "*.patch" | sort)
for i in $(seq -f "%04g" 1 1 $last)
2016-05-12 04:07:46 +02:00
do
if [ $i -lt $next ]; then
rm $(echo "$orderedfiles{@}" | sed -n "${i}p")
2016-05-12 04:07:46 +02:00
fi
done
else
rm -rf *.patch
fi
cd "$basedir/$target"
$gitcmd format-patch --no-stat -N -o "$basedir/${what_name}-Patches/" upstream/upstream >/dev/null
cd "$basedir"
$gitcmd add -A "$basedir/${what_name}-Patches"
cleanupPatches "$basedir/${what_name}-Patches"
echo " Patches saved for $what to $what_name-Patches/"
}
2016-03-19 05:11:14 +01:00
2016-04-02 05:55:54 +02:00
savePatches "$workdir/Spigot/Spigot-API" "Paper-API"
savePatches "$workdir/Spigot/Spigot-Server" "Paper-Server"
)