From 85f0a0c69a5d1ffbf759ae5553a3b09d1f520eda Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Mon, 9 Nov 2020 01:35:40 +0000 Subject: [PATCH] Capture some script failure states better Ensures that failures of primarily applying patches during builds should be passed up, this will need a better look over at some point --- scripts/build.sh | 2 +- waterfall | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/build.sh b/scripts/build.sh index dbc69a4..a9c077f 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -git submodule update --init && ./scripts/applyPatches.sh +git submodule update --init && ./scripts/applyPatches.sh || exit 1 if [ "$1" == "--jar" ]; then mvn clean package diff --git a/waterfall b/waterfall index 44e300e..d18144b 100755 --- a/waterfall +++ b/waterfall @@ -2,19 +2,19 @@ case "$1" in "rb" | "rbp" | "rebuild") - scripts/rebuildPatches.sh + scripts/rebuildPatches.sh || exit 1 ;; "p" | "patch") - scripts/build.sh + scripts/build.sh || exit 1 ;; "m" | "up" | "merge") - scripts/mergeUpstream.sh + scripts/mergeUpstream.sh || exit 1 ;; "b" | "build") - scripts/build.sh --jar + scripts/build.sh --jar || exit 1 ;; "e" | "edit") - scripts/edit.sh + scripts/edit.sh || exit 1 ;; *) echo "WaterfallMC build tool command. This provides a variety of commands to control the WaterfallMC"