testserver/applyPatches.sh

39 lines
1.2 KiB
Bash
Raw Normal View History

#!/bin/bash
PS1="$"
basedir=`pwd`
echo "Rebuilding Forked projects.... "
function applyPatch {
what=$1
target=$2
branch=$3
cd "$basedir/$what"
2014-11-28 01:17:45 +00:00
git fetch
2016-02-29 23:09:49 +00:00
git branch -f upstream "$branch" >/dev/null
cd "$basedir"
if [ ! -d "$basedir/$target" ]; then
2016-02-29 23:09:49 +00:00
git clone "$what" "$target"
fi
cd "$basedir/$target"
echo "Resetting $target to $what..."
2016-02-29 23:09:49 +00:00
git remote add -f 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..."
2016-02-29 23:09:49 +00:00
git am --abort >/dev/null 2>&1
git am --3way --ignore-whitespace "$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"
2013-01-19 08:18:20 +00:00
exit 1
else
echo " Patches applied cleanly to $target"
fi
}
2014-11-28 01:17:45 +00:00
2016-02-29 23:09:49 +00:00
applyPatch Bukkit Spigot-API HEAD && applyPatch CraftBukkit Spigot-Server patched
applyPatch Spigot-API Paper-API HEAD && applyPatch Spigot-Server Paper-Server HEAD