From 9c9de3cf44be027041da4e01cf682cb917d87465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Vis=C3=A9e?= Date: Thu, 20 Feb 2020 18:20:03 +0100 Subject: [PATCH] BusyBox realpath does not support -s flag, fallback to use no flags (#384) * BusyBox realpath does not support -s flag, fallback to use no flags * Fix config sourcing problem --- build-docker.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-docker.sh b/build-docker.sh index 72d8d363cb..8e3fe4e33b 100755 --- a/build-docker.sh +++ b/build-docker.sh @@ -34,7 +34,7 @@ IMG_VERSION=${IMG_VERSION:-$(git describe)} # Ensure that the configuration file is an absolute path if test -x /usr/bin/realpath; then - CONFIG_FILE=$(realpath -s "$CONFIG_FILE") + CONFIG_FILE=$(realpath -s "$CONFIG_FILE" || realpath "$CONFIG_FILE") fi # Ensure that the confguration file is present @@ -43,7 +43,7 @@ if test -z "${CONFIG_FILE}"; then exit 1 else # shellcheck disable=SC1090 - source "${CONFIG_FILE}" + source ${CONFIG_FILE} fi while getopts "c:" flag