Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-22 18:45:54 +01:00
Code Issues 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 f5eb0e04bc
commit ba4c7e9e8b
3 changed files with 22 additions and 7 deletions
Show Stats 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

7
build.sh
View File

@ -1,6 +1,9 @@
#!/bin/bash
git submodule update --init && ./remap.sh && ./decompile.sh && ./init.sh && ./applyPatches.sh
(git submodule update --init && ./remap.sh && ./decompile.sh && ./init.sh && ./applyPatches.sh) || (
echo "Failed to build Paper"
exit 1
) || exit 1
if [ "$1" == "--jar" ]; then
mvn clean install && ./paperclip.sh
(mvn clean install && ./paperclip.sh) || exit 1
fi

6
init.sh
View File

@ -30,6 +30,6 @@ do
"$patch" -s -d src/main/java/ "net/minecraft/server/$file" < "$patchFile"
done
git add src >/dev/null 2>&1
git commit -m "CraftBukkit $ $(date)" >/dev/null 2>&1
git checkout -f HEAD^ >/dev/null 2>&1
git add src >/dev/null 2>&1 || exit 1
git commit -m "CraftBukkit $ $(date)" >/dev/null 2>&1 || exit 1
git checkout -f HEAD^ >/dev/null 2>&1 || exit 1