fix: pass failed exit codes around as necessary

This commit is contained in:
Jose Diaz-Gonzalez committed 2022-04-16 02:25:48 -04:00
1 parent eec49878a5
commit ba7c685e11
2 files changed
+6 -2

No files matched your search

+1 -1
View File
@@ -22,7 +22,7 @@ trigger-builder-dockerfile-core-post-extract() {
if [[ ! -f "$NEW_DOCKERFILE" ]]; then if [[ ! -f "$NEW_DOCKERFILE" ]]; then
dokku_log_fail "Invalid dockerfile-path specified: $NEW_DOCKERFILE" dokku_log_fail "Invalid dockerfile-path specified: $NEW_DOCKERFILE"
return return 1
fi fi
mv "$NEW_DOCKERFILE" Dockerfile mv "$NEW_DOCKERFILE" Dockerfile
+5 -1
View File
@@ -44,6 +44,7 @@ git_build_app_repo() {
else else
git_trigger_build "$APP" "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" "$REV" | sed -u "s/^/"$'\e[1G'"/" git_trigger_build "$APP" "$GIT_BUILD_APP_REPO_TMP_WORK_DIR" "$REV" | sed -u "s/^/"$'\e[1G'"/"
fi fi
return $?
} }
git_trigger_build() { git_trigger_build() {
@@ -51,7 +52,9 @@ git_trigger_build() {
declare APP="$1" TMP_WORK_DIR="$2" REV="$3" declare APP="$1" TMP_WORK_DIR="$2" REV="$3"
local BUILDER local BUILDER
plugn trigger core-post-extract "$APP" "$TMP_WORK_DIR" "$REV" if ! plugn trigger core-post-extract "$APP" "$TMP_WORK_DIR" "$REV"; then
return 1
fi
plugn trigger post-extract "$APP" "$TMP_WORK_DIR" "$REV" plugn trigger post-extract "$APP" "$TMP_WORK_DIR" "$REV"
BUILDER="$(plugn trigger builder-detect "$APP" "$TMP_WORK_DIR" | head -n1 || true)" BUILDER="$(plugn trigger builder-detect "$APP" "$TMP_WORK_DIR" | head -n1 || true)"
@@ -139,6 +142,7 @@ git_build() {
fi fi
git_build_app_repo "$APP" "$REF" git_build_app_repo "$APP" "$REF"
return $?
} }
git_receive_app() { git_receive_app() {