From bd219d2088bd5ba9040f94cc5250109286c8d91e Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 6 Jun 2017 20:45:53 -0600
Subject: [PATCH] Fix pipeline error exit
---
cook.sh | 36 ++++++++++++++++++++++++++++++------
1 file changed, 30 insertions(+), 6 deletions(-)
diff --git a/cook.sh b/cook.sh
index 4d4bf983f..8fc93feb6 100755
--- a/cook.sh
+++ b/cook.sh
@@ -97,7 +97,11 @@ function op {
skip="0"
if [ "$(type -t recipe_version)" = "function" ]
then
- recipe_version || skip="1"
+ recipe_version
+ if [ "$?" -ne "0" ]
+ then
+ skip="1"
+ fi
fi
if [ "$skip" -eq "0" ]
then
@@ -118,7 +122,11 @@ function op {
skip="0"
if [ "$(type -t recipe_update)" = "function" ]
then
- recipe_update || skip="1"
+ recipe_update
+ if [ "$?" -ne "0" ]
+ then
+ skip="1"
+ fi
fi
if [ "$skip" -eq "0" ]
then
@@ -131,7 +139,11 @@ function op {
skip="0"
if [ "$(type -t recipe_build)" = "function" ]
then
- recipe_build || skip="1"
+ recipe_build
+ if [ "$?" -ne "0" ]
+ then
+ skip="1"
+ fi
fi
if [ "$skip" -eq "0" ]
then
@@ -145,7 +157,11 @@ function op {
skip="0"
if [ "$(type -t recipe_test)" = "function" ]
then
- recipe_test || skip="1"
+ recipe_test
+ if [ "$?" -ne "0" ]
+ then
+ skip="1"
+ fi
fi
if [ "$skip" -eq "0" ]
then
@@ -159,7 +175,11 @@ function op {
skip="0"
if [ "$(type -t recipe_clean)" = "function" ]
then
- recipe_clean || skip="1"
+ recipe_clean
+ if [ "$?" -ne "0" ]
+ then
+ skip="1"
+ fi
fi
if [ "$skip" -eq "0" ]
then
@@ -173,7 +193,11 @@ function op {
skip="0"
if [ "$(type -t recipe_stage)" = "function" ]
then
- recipe_stage ../stage || skip="1"
+ recipe_stage ../stage
+ if [ "$?" -ne "0" ]
+ then
+ skip="1"
+ fi
fi
if [ "$skip" -eq "0" ]
then
--
GitLab