Properly forward exit 1 code from the paper root command

This is so the CI server can pick up when applying patches fails,
and mark the build as a failure.
This commit is contained in:
Aikar
2018-07-30 17:37:24 -04:00
parent 2b23006694
commit 15735117d7
5 changed files with 18 additions and 10 deletions

20
paper
View File

@@ -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