From 33ee5849db5a2f593ca04f6d6aeb1f3e7d4eea28 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Sat, 5 Sep 2020 21:01:07 +0100 Subject: [PATCH] =?UTF-8?q?imagebuilder:=20subcommand=20=E2=86=92=20imaget?= =?UTF-8?q?ype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- imagebuilder.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/imagebuilder.sh b/imagebuilder.sh index dd38c1d..716d3dd 100755 --- a/imagebuilder.sh +++ b/imagebuilder.sh @@ -158,13 +158,13 @@ case "${subcommand}" in fi task_end "$?"; - if [[ "${subcommand}" == "base-nopush" ]]; then - echo "Nopush mode invoked, not checking output directory or pushing to docker registry"; + if [[ "${imagetype}" == "base-nopush" ]]; then + echo "${HC}Nopush mode invoked, not checking output directory or pushing to docker registry${RS}"; exit 0; fi if [[ ! -d "${output_dir}" ]]; then - echo -e "Error: The builder script failed to create the output directory."; + echo -e "${FRED}${HC}Error: The builder script failed to create the output directory (expeting directory at ${FBLE}${output_dir}${FRED}, but found nothing).${RS}"; exit 6; fi