From 7f143a185e891055ef2580b68750ade8c7cdaad5 Mon Sep 17 00:00:00 2001 From: Leander Date: Mon, 18 Nov 2019 14:32:16 +0100 Subject: [PATCH] Export base directory before loading config file (#347) --- build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index a730e44..d93d4dc 100755 --- a/build.sh +++ b/build.sh @@ -122,6 +122,8 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi +BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"} +export BASE_DIR if [ -f config ]; then # shellcheck disable=SC1091 @@ -154,7 +156,6 @@ export IMG_DATE="${IMG_DATE:-"$(date +%Y-%m-%d)"}" export IMG_FILENAME="${IMG_FILENAME:-"${IMG_DATE}-${IMG_NAME}"}" export ZIP_FILENAME="${ZIP_FILENAME:-"image_${IMG_DATE}-${IMG_NAME}"}" -BASE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" export SCRIPT_DIR="${BASE_DIR}/scripts" export WORK_DIR="${WORK_DIR:-"${BASE_DIR}/work/${IMG_DATE}-${IMG_NAME}"}" export DEPLOY_DIR=${DEPLOY_DIR:-"${BASE_DIR}/deploy"} @@ -179,8 +180,6 @@ export TIMEZONE_DEFAULT="${TIMEZONE_DEFAULT:-Europe/London}" export GIT_HASH=${GIT_HASH:-"$(git rev-parse HEAD)"} -export BASE_DIR - export CLEAN export IMG_NAME export APT_PROXY