2016-04-02 05:55:54 +02:00
|
|
|
#!/usr/bin/env bash
|
2013-01-15 02:18:40 +01:00
|
|
|
|
2014-04-14 13:01:27 +02:00
|
|
|
PS1="$"
|
2016-04-03 01:34:27 +02:00
|
|
|
basedir=$(realpath "$1")
|
2016-04-02 05:55:54 +02:00
|
|
|
workdir="$basedir/work"
|
2013-01-15 02:18:40 +01:00
|
|
|
echo "Rebuilding patch files from current fork state..."
|
2016-03-01 00:09:49 +01:00
|
|
|
git config core.safecrlf false
|
2014-04-14 13:01:27 +02:00
|
|
|
|
2013-01-16 18:08:09 +01:00
|
|
|
function cleanupPatches {
|
2013-11-06 01:26:20 +01:00
|
|
|
cd "$1"
|
2013-01-16 18:08:09 +01:00
|
|
|
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=$(git diff --staged "$patch" | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|.index)")
|
2013-01-22 03:46:26 +01:00
|
|
|
|
|
|
|
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')
|
2013-01-22 03:46:26 +01:00
|
|
|
fi
|
|
|
|
|
|
|
|
if [ "x$diffs" == "x" ] ; then
|
2016-04-02 05:55:54 +02:00
|
|
|
git reset HEAD "$patch" >/dev/null
|
|
|
|
git checkout -- "$patch" >/dev/null
|
2013-01-16 18:08:09 +01:00
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
2014-04-14 13:01:27 +02:00
|
|
|
|
2013-01-15 02:18:40 +01:00
|
|
|
function savePatches {
|
|
|
|
what=$1
|
2016-04-02 05:55:54 +02:00
|
|
|
what_name=$(basename "$what")
|
2013-01-15 02:18:40 +01:00
|
|
|
target=$2
|
2016-03-01 00:09:49 +01:00
|
|
|
echo "Formatting patches for $what..."
|
2016-03-22 02:40:18 +01:00
|
|
|
|
|
|
|
cd "$basedir/${what_name}-Patches/"
|
|
|
|
rm -rf *.patch
|
|
|
|
|
2013-11-06 01:26:20 +01:00
|
|
|
cd "$basedir/$target"
|
2016-03-22 01:46:54 +01:00
|
|
|
|
2016-03-21 18:22:47 +01:00
|
|
|
git format-patch --no-stat -N -o "$basedir/${what_name}-Patches/" upstream/upstream >/dev/null
|
2013-11-06 01:26:20 +01:00
|
|
|
cd "$basedir"
|
2016-03-21 18:22:47 +01:00
|
|
|
git add -A "$basedir/${what_name}-Patches"
|
|
|
|
cleanupPatches "$basedir/${what_name}-Patches"
|
|
|
|
echo " Patches saved for $what to $what_name-Patches/"
|
2013-01-15 02:18:40 +01:00
|
|
|
}
|
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"
|