7b0c576798
Allows us much greater control over the Spigot portion of the code and makes us more "proper" Credit to @Dmck2b for originally passing the idea along a while back
43 lines
1.3 KiB
Bash
Executable File
43 lines
1.3 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
PS1="$"
|
|
basedir=`pwd`
|
|
echo "Rebuilding Forked projects.... "
|
|
|
|
function applyPatch {
|
|
what=$1
|
|
target=$2
|
|
cd "$basedir/$what"
|
|
git branch -f upstream >/dev/null
|
|
|
|
cd "$basedir"
|
|
if [ ! -d "$basedir/$target" ]; then
|
|
git clone $1 $target -b upstream
|
|
fi
|
|
cd "$basedir/$target"
|
|
echo "Resetting $target to $what..."
|
|
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
|
|
echo " Applying patches to $target..."
|
|
git am --abort
|
|
git am --3way "$basedir/${what}-Patches/"*.patch
|
|
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"
|
|
exit 1
|
|
else
|
|
echo " Patches applied cleanly to $target"
|
|
fi
|
|
}
|
|
echo
|
|
echo "Applying SpigotMC patches to CraftBukkit and Bukkit"
|
|
echo
|
|
applyPatch Bukkit Spigot-API && applyPatch CraftBukkit Spigot-Server
|
|
echo
|
|
echo "Applying PaperSpigot patches to Spigot-Server and Spigot-API"
|
|
echo
|
|
applyPatch Spigot-API PaperSpigot-API && applyPatch Spigot-Server PaperSpigot-Server |