Paper/applyPatches.sh
mrkirby153 5b808a6d45 Batch files now work in directories with spaces in it
Before the batch files could not run if the path to the directory had one
or more spaces in it. EG: "C:/Desktop/Spigot Repo". Now works with the
patch
2013-11-15 19:56:20 +11:00

37 lines
1.0 KiB
Bash
Executable File

#!/bin/bash
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
}
applyPatch Bukkit Spigot-API && applyPatch CraftBukkit Spigot-Server