From 3f98520ab6aee6e4fcfb749e4b864feac3edf901 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@siemens.com>
Date: Sun, 21 Mar 2021 09:14:12 +0100
Subject: [PATCH] kas-container: Improve KAS_WORK/BUILD_DIR retrieval

Perform link resolution unconditionally to account for cases when the
default paths are links. Use default values to simplify the assignments.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kas-container | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/kas-container b/kas-container
index df59dc4..af5a06f 100755
--- a/kas-container
+++ b/kas-container
@@ -87,17 +87,8 @@ set_container_image_var() {
 	KAS_CONTAINER_IMAGE="${KAS_CONTAINER_IMAGE_PATH}/${KAS_CONTAINER_IMAGE_NAME}:${KAS_IMAGE_VERSION}"
 }
 
-if [ -n "${KAS_WORK_DIR}" ]; then
-	KAS_WORK_DIR=$(readlink -f "${KAS_WORK_DIR}")
-else
-	KAS_WORK_DIR="$(pwd)"
-fi
-
-if [ -n "${KAS_BUILD_DIR}" ]; then
-	KAS_BUILD_DIR=$(readlink -f "${KAS_BUILD_DIR}")
-else
-	KAS_BUILD_DIR="${KAS_WORK_DIR}/build"
-fi
+KAS_WORK_DIR=$(readlink -f "${KAS_WORK_DIR:-$(pwd)}")
+KAS_BUILD_DIR=$(readlink -f "${KAS_BUILD_DIR:-${KAS_WORK_DIR}/build}")
 
 KAS_CONTAINER_ENGINE="${KAS_CONTAINER_ENGINE:-${KAS_DOCKER_ENGINE}}"
 if [ -z "${KAS_CONTAINER_ENGINE}" ]; then