From 833a65124e8df4f2c9aad2a962ce95ecdab6a338 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sat, 8 Jan 2022 08:55:31 +0100 Subject: [PATCH] kas-container: Factor out clean into a separate function The logic will grow, and this better happens outside of the command line parser. Signed-off-by: Jan Kiszka --- kas-container | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/kas-container b/kas-container index 40430ae..8311d1d 100755 --- a/kas-container +++ b/kas-container @@ -87,6 +87,20 @@ enable_isar_mode() { fi } +run_clean() { + if [ -n "${KAS_ISAR_ARGS}" ]; then + set_container_image_var + # SC2086: Double quote to prevent globbing and word splitting. + # shellcheck disable=2086 + trace ${KAS_CONTAINER_COMMAND} run -v "${KAS_BUILD_DIR}":/build:rw \ + --workdir=/build --rm ${KAS_ISAR_ARGS} \ + ${KAS_CONTAINER_IMAGE} \ + sudo rm -rf tmp + else + trace rm -rf "${KAS_BUILD_DIR}/tmp" + fi +} + KAS_IMAGE_VERSION_DEFAULT="2.6.3" KAS_CONTAINER_IMAGE_PATH_DEFAULT="ghcr.io/siemens/kas" KAS_CONTAINER_IMAGE_NAME_DEFAULT="kas" @@ -208,17 +222,7 @@ while [ $# -gt 0 ]; do ;; clean) [ $# -eq 1 ] || usage - if [ -n "${KAS_ISAR_ARGS}" ]; then - set_container_image_var - # SC2086: Double quote to prevent globbing and word splitting. - # shellcheck disable=2086 - trace ${KAS_CONTAINER_COMMAND} run -v "${KAS_BUILD_DIR}":/build:rw \ - --workdir=/build --rm ${KAS_ISAR_ARGS} \ - ${KAS_CONTAINER_IMAGE} \ - sudo rm -rf tmp - else - trace rm -rf "${KAS_BUILD_DIR}/tmp" - fi + run_clean "$1" exit 0 ;; shell)