Lukas A / Spigot / 899f5ee8c6f

Commits

Thinkofname authored 899f5ee8c6f 24 Jan 2015

Fix applyPatches.sh not correctly pulling bukkit updates

Modified

-30
+    if [ "$?" != "0" ]; then
-31
+        echo "  Something did not apply cleanly to $target."
-32
+        echo "  Please review above details and finish the apply then"
-33
+        echo "  save the changes with rebuildPatches.sh"
-34
+        exit 1
-35
+    else
-36
+        echo "  Patches applied cleanly to $target"
-37
+    fi
-38
+}
-39
--
+applyPatch Bukkit Spigot-API origin/master && applyPatch CraftBukkit Spigot-Server origin/patched
-+
+cd ../Bukkit
-+
+hash=$(git rev-parse HEAD)
-+
+git branch -f spigot "$hash"
-+
-+
+applyPatch Bukkit Spigot-API origin/spigot && applyPatch CraftBukkit Spigot-Server origin/patched