2013-01-15 12:18:40 +11:00
|
|
|
#!/bin/bash
|
|
|
|
|
2014-04-14 21:01:27 +10:00
|
|
|
PS1="$"
|
2013-01-21 20:24:30 +11:00
|
|
|
basedir=`pwd`
|
2013-01-15 12:18:40 +11:00
|
|
|
echo "Rebuilding Forked projects.... "
|
|
|
|
|
|
|
|
function applyPatch {
|
|
|
|
what=$1
|
|
|
|
target=$2
|
2014-12-02 00:02:15 -06:00
|
|
|
branch=$3
|
2013-11-05 16:26:20 -08:00
|
|
|
cd "$basedir/$what"
|
2014-11-27 17:17:45 -08:00
|
|
|
git fetch
|
2014-12-02 00:02:15 -06:00
|
|
|
git reset --hard "$branch"
|
2013-01-19 14:04:56 -05:00
|
|
|
git branch -f upstream >/dev/null
|
|
|
|
|
2013-11-05 16:26:20 -08:00
|
|
|
cd "$basedir"
|
2013-01-15 12:18:40 +11:00
|
|
|
if [ ! -d "$basedir/$target" ]; then
|
2013-01-19 14:04:56 -05:00
|
|
|
git clone $1 $target -b upstream
|
2013-01-15 12:18:40 +11:00
|
|
|
fi
|
|
|
|
cd "$basedir/$target"
|
|
|
|
echo "Resetting $target to $what..."
|
2013-01-19 14:04:56 -05:00
|
|
|
git remote rm upstream 2>/dev/null 2>&1
|
|
|
|
git remote add upstream ../$what >/dev/null 2>&1
|
|
|
|
git checkout master >/dev/null 2>&1
|
|
|
|
git fetch upstream >/dev/null 2>&1
|
|
|
|
git reset --hard upstream/upstream
|
2013-01-15 12:18:40 +11:00
|
|
|
echo " Applying patches to $target..."
|
2013-03-23 10:05:32 +11:00
|
|
|
git am --abort
|
2013-11-05 16:26:20 -08:00
|
|
|
git am --3way "$basedir/${what}-Patches/"*.patch
|
2013-01-15 12:18:40 +11:00
|
|
|
if [ "$?" != "0" ]; then
|
|
|
|
echo " Something did not apply cleanly to $target."
|
|
|
|
echo " Please review above details and finish the apply then"
|
|
|
|
echo " save the changes with rebuildPatches.sh"
|
2013-01-19 19:18:20 +11:00
|
|
|
exit 1
|
2013-01-15 12:18:40 +11:00
|
|
|
else
|
|
|
|
echo " Patches applied cleanly to $target"
|
|
|
|
fi
|
|
|
|
}
|
2014-11-27 17:17:45 -08:00
|
|
|
|
2014-07-21 15:46:54 -05:00
|
|
|
echo
|
|
|
|
echo "Applying SpigotMC patches to CraftBukkit and Bukkit"
|
|
|
|
echo
|
2015-01-24 01:00:49 +00:00
|
|
|
cd ../Bukkit
|
|
|
|
hash=$(git rev-parse HEAD)
|
|
|
|
git branch -f spigot "$hash"
|
|
|
|
applyPatch Bukkit Spigot-API origin/spigot && applyPatch CraftBukkit Spigot-Server origin/patched
|
2014-07-21 15:46:54 -05:00
|
|
|
echo
|
|
|
|
echo "Applying PaperSpigot patches to Spigot-Server and Spigot-API"
|
|
|
|
echo
|
2014-11-27 17:17:45 -08:00
|
|
|
applyPatch Spigot-API PaperSpigot-API && applyPatch Spigot-Server PaperSpigot-Server
|