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
This commit is contained in:
Tim Visée 2020-02-20 18:20:03 +01:00 committed by GitHub
parent 38d22e976a
commit 65f91b8349
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -32,7 +32,7 @@ done
# Ensure that the configuration file is an absolute path # Ensure that the configuration file is an absolute path
if test -x /usr/bin/realpath; then if test -x /usr/bin/realpath; then
CONFIG_FILE=$(realpath -s "$CONFIG_FILE") CONFIG_FILE=$(realpath -s "$CONFIG_FILE" || realpath "$CONFIG_FILE")
fi fi
# Ensure that the confguration file is present # Ensure that the confguration file is present
@ -41,7 +41,7 @@ if test -z "${CONFIG_FILE}"; then
exit 1 exit 1
else else
# shellcheck disable=SC1090 # shellcheck disable=SC1090
source "${CONFIG_FILE}" source ${CONFIG_FILE}
fi fi
CONTAINER_NAME=${CONTAINER_NAME:-pigen_work} CONTAINER_NAME=${CONTAINER_NAME:-pigen_work}