2013-01-15 02:18:40 +01:00
|
|
|
#!/bin/bash
|
|
|
|
|
2014-04-14 13:01:27 +02:00
|
|
|
PS1="$"
|
2013-01-21 10:24:30 +01:00
|
|
|
basedir=`pwd`
|
2013-01-15 02:18:40 +01:00
|
|
|
echo "Rebuilding Forked projects.... "
|
|
|
|
|
|
|
|
function applyPatch {
|
|
|
|
what=$1
|
2016-03-21 18:22:47 +01:00
|
|
|
what_name=$(basename $what)
|
2013-01-15 02:18:40 +01:00
|
|
|
target=$2
|
2014-12-02 07:02:15 +01:00
|
|
|
branch=$3
|
2016-03-25 05:11:38 +01:00
|
|
|
|
2013-11-06 01:26:20 +01:00
|
|
|
cd "$basedir/$what"
|
2014-11-28 02:17:45 +01:00
|
|
|
git fetch
|
2016-03-01 00:09:49 +01:00
|
|
|
git branch -f upstream "$branch" >/dev/null
|
2013-01-19 20:04:56 +01:00
|
|
|
|
2013-11-06 01:26:20 +01:00
|
|
|
cd "$basedir"
|
2013-01-15 02:18:40 +01:00
|
|
|
if [ ! -d "$basedir/$target" ]; then
|
2016-03-01 00:09:49 +01:00
|
|
|
git clone "$what" "$target"
|
2013-01-15 02:18:40 +01:00
|
|
|
fi
|
|
|
|
cd "$basedir/$target"
|
2016-03-21 18:22:47 +01:00
|
|
|
echo "Resetting $target to $what_name..."
|
2016-03-25 05:11:38 +01:00
|
|
|
git remote rm upstream > /dev/null 2>&1
|
|
|
|
git remote add upstream $basedir/$what >/dev/null 2>&1
|
|
|
|
git checkout master 2>/dev/null || git checkout -b master
|
2013-01-19 20:04:56 +01:00
|
|
|
git fetch upstream >/dev/null 2>&1
|
|
|
|
git reset --hard upstream/upstream
|
2013-01-15 02:18:40 +01:00
|
|
|
echo " Applying patches to $target..."
|
2016-03-01 00:09:49 +01:00
|
|
|
git am --abort >/dev/null 2>&1
|
2016-03-21 18:22:47 +01:00
|
|
|
git am --3way --ignore-whitespace "$basedir/${what_name}-Patches/"*.patch
|
2013-01-15 02:18:40 +01: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 09:18:20 +01:00
|
|
|
exit 1
|
2013-01-15 02:18:40 +01:00
|
|
|
else
|
|
|
|
echo " Patches applied cleanly to $target"
|
|
|
|
fi
|
|
|
|
}
|
2014-11-28 02:17:45 +01:00
|
|
|
|
2016-03-21 18:22:47 +01:00
|
|
|
# Move into spigot dir
|
|
|
|
pushd Spigot
|
|
|
|
basedir=$basedir/Spigot
|
|
|
|
# Apply Spigot
|
2016-03-25 01:39:20 +01:00
|
|
|
(
|
|
|
|
applyPatch ../Bukkit Spigot-API HEAD &&
|
|
|
|
applyPatch ../CraftBukkit Spigot-Server patched
|
|
|
|
) || (
|
|
|
|
echo "Failed to apply Spigot Patches"
|
|
|
|
exit 1
|
|
|
|
) || exit 1
|
2016-03-21 18:22:47 +01:00
|
|
|
# Move out of Spigot
|
|
|
|
popd
|
2016-03-23 23:29:56 +01:00
|
|
|
basedir=$(dirname "$basedir")
|
2016-03-21 18:22:47 +01:00
|
|
|
|
2016-03-31 02:50:23 +02:00
|
|
|
echo "Importing MC Dev"
|
|
|
|
|
|
|
|
./importmcdev.sh
|
|
|
|
|
2016-03-21 18:22:47 +01:00
|
|
|
# Apply paper
|
2016-03-25 01:39:20 +01:00
|
|
|
(
|
|
|
|
applyPatch Spigot/Spigot-API Paper-API HEAD &&
|
|
|
|
applyPatch Spigot/Spigot-Server Paper-Server HEAD
|
|
|
|
) || (
|
|
|
|
echo "Failed to apply Paper Patches"
|
|
|
|
exit 1
|
|
|
|
) || exit 1
|
2016-03-21 18:22:47 +01:00
|
|
|
|