SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Abort properly on error for build script

Browse Source
This commit is contained in:
Aikar
2016-03-24 20:39:20 -04:00
parent 926ba9a3bb
commit 92f8da4b50
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
applyPatches.sh
View File

@@ -40,11 +40,23 @@ function applyPatch {
pushd Spigot
basedir=$basedir/Spigot
# Apply Spigot
applyPatch ../Bukkit Spigot-API HEAD && applyPatch ../CraftBukkit Spigot-Server patched
(
applyPatch ../Bukkit Spigot-API HEAD &&
applyPatch ../CraftBukkit Spigot-Server patched
) || (
echo "Failed to apply Spigot Patches"
exit 1
) || exit 1
# Move out of Spigot
popd
basedir=$(dirname "$basedir")
# Apply paper
applyPatch Spigot/Spigot-API Paper-API HEAD && applyPatch Spigot/Spigot-Server Paper-Server HEAD
(
applyPatch Spigot/Spigot-API Paper-API HEAD &&
applyPatch Spigot/Spigot-Server Paper-Server HEAD
) || (
echo "Failed to apply Paper Patches"
exit 1
) || exit 1