diff --git a/paper b/paper index f80040c8f..8c2f4ffdc 100755 --- a/paper +++ b/paper @@ -27,27 +27,28 @@ gitcmd="git -c commit.gpgsign=false" source "$basedir/scripts/functions.sh" +failed=0 case "$1" in "rb" | "rbp" | "rebuild") ( set -e cd "$basedir" - scripts/rebuildPatches.sh "$basedir" - ) + scripts/rebuildPatches.sh "$basedir" || exit 1 + ) || failed=1 ;; "p" | "patch") ( set -e cd "$basedir" - scripts/build.sh "$basedir" - ) + scripts/build.sh "$basedir" || exit 1 + ) || failed=1 ;; "j" | "jar") ( set -e cd "$basedir" - scripts/build.sh "$basedir" "--jar" - ) + scripts/build.sh "$basedir" "--jar" || exit 1 + ) || failed=1 ;; "make") ( @@ -191,3 +192,10 @@ unset -f color unset -f colorend unset -f paperstash unset -f paperunstash +if [ "$failed" == "1" ]; then + unset failed + false +else + unset failed + true +fi \ No newline at end of file diff --git a/scripts/applyPatches.sh b/scripts/applyPatches.sh index ac4062c8d..1b0f5666f 100755 --- a/scripts/applyPatches.sh +++ b/scripts/applyPatches.sh @@ -95,4 +95,4 @@ cd "$basedir" echo "Failed to apply Paper Patches" exit 1 ) || exit 1 -) +) || exit 1 diff --git a/scripts/build.sh b/scripts/build.sh index 62d4bca0e..9b8fa286a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -12,4 +12,4 @@ gitcmd="git -c commit.gpgsign=false" if [ "$2" == "--jar" ]; then mvn clean install && ./scripts/paperclip.sh "$basedir" fi -) +) || exit 1 diff --git a/scripts/paperclip.sh b/scripts/paperclip.sh index 693e6fc48..2722ca3dd 100755 --- a/scripts/paperclip.sh +++ b/scripts/paperclip.sh @@ -19,4 +19,4 @@ echo "" echo "" echo "Build success!" echo "Copied final jar to $(cd "$basedir" && pwd -P)/paperclip.jar" -) +) || exit 1 diff --git a/scripts/rebuildPatches.sh b/scripts/rebuildPatches.sh index ef64ea818..308ac4d0c 100755 --- a/scripts/rebuildPatches.sh +++ b/scripts/rebuildPatches.sh @@ -61,4 +61,4 @@ function savePatches { savePatches "$workdir/Spigot/Spigot-API" "Paper-API" savePatches "$workdir/Spigot/Spigot-Server" "Paper-Server" -) +) || exit 1