2013-01-15 01:18:40 +00:00
|
|
|
#!/bin/bash
|
|
|
|
|
2014-04-14 11:01:27 +00:00
|
|
|
PS1="$"
|
2013-01-21 09:24:30 +00:00
|
|
|
basedir=`pwd`
|
2013-01-15 01:18:40 +00:00
|
|
|
echo "Rebuilding patch files from current fork state..."
|
2016-01-04 06:39:30 +00:00
|
|
|
git config core.safecrlf false
|
2014-04-14 11:01:27 +00:00
|
|
|
|
2013-01-16 17:08:09 +00:00
|
|
|
function cleanupPatches {
|
2013-11-06 00:26:20 +00:00
|
|
|
cd "$1"
|
2013-01-16 17:08:09 +00:00
|
|
|
for patch in *.patch; do
|
2016-01-04 06:39:30 +00:00
|
|
|
echo "$patch"
|
2013-01-22 02:46:26 +00:00
|
|
|
gitver=$(tail -n 2 $patch | grep -ve "^$" | tail -n 1)
|
2016-01-04 06:39:30 +00:00
|
|
|
diffs=$(git diff --staged $patch | grep -E "^(\+|\-)" | grep -Ev "(From [a-z0-9]{32,}|\-\-\- a|\+\+\+ b|Date\: |.index)")
|
2013-01-22 02:46:26 +00:00
|
|
|
|
|
|
|
testver=$(echo "$diffs" | tail -n 2 | grep -ve "^$" | tail -n 1 | grep "$gitver")
|
|
|
|
if [ "x$testver" != "x" ]; then
|
2016-01-04 06:39:30 +00:00
|
|
|
diffs=$(echo "$diffs" | sed 'N;$!P;$!D;$d')
|
2013-01-22 02:46:26 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if [ "x$diffs" == "x" ] ; then
|
2013-01-16 17:08:09 +00:00
|
|
|
git reset HEAD $patch >/dev/null
|
|
|
|
git checkout -- $patch >/dev/null
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
}
|
2014-04-14 11:01:27 +00:00
|
|
|
|
2013-01-15 01:18:40 +00:00
|
|
|
function savePatches {
|
|
|
|
what=$1
|
|
|
|
target=$2
|
2016-01-04 06:39:30 +00:00
|
|
|
echo "Formatting patches for $what..."
|
2013-11-06 00:26:20 +00:00
|
|
|
cd "$basedir/$target"
|
2016-01-04 06:39:30 +00:00
|
|
|
git format-patch --no-stat -N -o "$basedir/${what}-Patches/" upstream/upstream >/dev/null
|
2013-11-06 00:26:20 +00:00
|
|
|
cd "$basedir"
|
2016-01-04 06:39:30 +00:00
|
|
|
git add -A "$basedir/${what}-Patches"
|
2013-11-06 00:26:20 +00:00
|
|
|
cleanupPatches "$basedir/${what}-Patches"
|
2013-01-15 01:18:40 +00:00
|
|
|
echo " Patches saved for $what to $what-Patches/"
|
|
|
|
}
|
2016-01-04 06:39:30 +00:00
|
|
|
if [ "$1" == "clean" ]; then
|
|
|
|
rm -rf Spigot-*-Patches
|
|
|
|
fi
|
2014-07-21 20:46:54 +00:00
|
|
|
savePatches Spigot-API PaperSpigot-API
|
2016-01-04 06:39:30 +00:00
|
|
|
savePatches Spigot-Server PaperSpigot-Server
|