From a5c47d3f221337d011f0ec40af0560b866094219 Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Thu, 25 Jul 2024 13:01:03 -0500
Subject: [PATCH] updated build system

---
 scripts/copy_mingw64_deps.sh |  7 +++----
 scripts/create_containers.sh | 17 ++++++++---------
 scripts/deliver.sh           | 12 ++++--------
 scripts/docker_common.sh     | 10 +++++-----
 scripts/env.sh               | 25 +++++++++++--------------
 scripts/info.sh              | 10 +++-------
 scripts/make_common.sh       | 29 ++++++++++++++---------------
 scripts/make_package.sh      |  6 +++---
 scripts/make_unix.sh         | 17 ++++++++---------
 scripts/make_win32.sh        | 15 +++++++--------
 scripts/run_docker_shell.sh  | 15 +++++++--------
 scripts/setup_msys2.sh       |  7 +++----
 12 files changed, 76 insertions(+), 94 deletions(-)

diff --git a/scripts/copy_mingw64_deps.sh b/scripts/copy_mingw64_deps.sh
index 5fda36bd..522cf11c 100755
--- a/scripts/copy_mingw64_deps.sh
+++ b/scripts/copy_mingw64_deps.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
-
 PROJECT_MINGW64_COPY_DEPENDENCIES=()
 
-. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1>/dev/null 2>&1
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1>/dev/null 2>&1
 
 if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_STATIC_LINK}" == "OFF" ]; then
   mkdir -p "${PROJECT_DIST_DIR}"
diff --git a/scripts/create_containers.sh b/scripts/create_containers.sh
index 4830a940..2f2afbd4 100755
--- a/scripts/create_containers.sh
+++ b/scripts/create_containers.sh
@@ -1,24 +1,23 @@
 #!/bin/bash
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1
 
-. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1
-
-if [ -f "${CURRENT_DIR}/cleanup.sh" ]; then
-  . "${CURRENT_DIR}/cleanup.sh" "$1" "$2" "$3" "$4" "$5"
-  rm ${CURRENT_DIR}/cleanup.*
+if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then
+  . "${PROJECT_SCRIPTS_DIR}/cleanup.sh" "$1" "$2" "$3" "$4" "$5"
+  rm ${PROJECT_SCRIPTS_DIR}/cleanup.*
 fi
 
 function create_containers() {
   BUILD_TYPE=$1
 
-  for FILE in "${SOURCE_DIR}/docker/${BUILD_TYPE}/*"; do
+  for FILE in "${PROJECT_SOURCE_DIR}/docker/${BUILD_TYPE}/*"; do
     DOCKER_CREATE_ONLY=1
     DOCKER_NAME=$(basename ${FILE})
     DOCKER_TAG=${PROJECT_NAME}:${DOCKER_NAME}
 
-    . "${CURRENT_DIR}/docker_common.sh"
+    . "${PROJECT_SCRIPTS_DIR}/docker_common.sh"
   done
 }
 
diff --git a/scripts/deliver.sh b/scripts/deliver.sh
index a4427c2e..ee83a25a 100755
--- a/scripts/deliver.sh
+++ b/scripts/deliver.sh
@@ -3,13 +3,9 @@
 DEST_DIR=$1
 DIST_DIR=$2
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
-
-SOURCE_DIR=${CURRENT_DIR}/..
-SOURCE_DIR=$(realpath ${SOURCE_DIR})
-
-. "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7"
 
 function error_exit() {
   echo $1
@@ -37,7 +33,7 @@ if [ ! -d "${DEST_DIR}" ]; then
   error_exit "dest directory not found: ${DEST_DIR}" 2
 fi
 
-pushd "${SOURCE_DIR}"
+pushd "${PROJECT_SOURCE_DIR}"
 BRANCH=$(git branch --show-current)
 RELEASE=$(grep set\(PROJECT_RELEASE_ITER ./config.sh | sed s/\)//g | awk '{print $2}')
 popd
diff --git a/scripts/docker_common.sh b/scripts/docker_common.sh
index d9f6f1ee..9dfc46ae 100755
--- a/scripts/docker_common.sh
+++ b/scripts/docker_common.sh
@@ -18,8 +18,8 @@ if [ "${DOCKER_CREATE_ONLY}" != "1" ]; then
   docker rm ${DOCKER_CONTAINER}
 fi
 
-pushd "${SOURCE_DIR}/support"
-cp -f ${SOURCE_DIR}/docker/${PROJECT_BUILD_ARCH}/${DOCKER_NAME} Dockerfile
+pushd "${PROJECT_SOURCE_DIR}/support"
+cp -f ${PROJECT_SOURCE_DIR}/docker/${PROJECT_BUILD_ARCH}/${DOCKER_NAME} Dockerfile
 docker build ${APP_VERSION_BUILD_ARGS} \
   --build-arg NUM_JOBS=${NUM_JOBS} \
   -t ${DOCKER_TAG} . || exit 1
@@ -31,8 +31,8 @@ if [ "${DOCKER_CREATE_ONLY}" != "1" ]; then
     --env MY_NUM_JOBS=${NUM_JOBS} \
     --name ${DOCKER_CONTAINER} \
     -u $(id -u):$(id -g) \
-    -v ${SOURCE_DIR}:${SOURCE_DIR}:rw,z \
-    -w ${SOURCE_DIR} \
+    -v ${PROJECT_SOURCE_DIR}:${PROJECT_SOURCE_DIR}:rw,z \
+    -w ${PROJECT_SOURCE_DIR} \
     ${DOCKER_TAG} || exit 1
 
   if [ "${DOCKER_SHELL}" == "1" ]; then
@@ -41,7 +41,7 @@ if [ "${DOCKER_CREATE_ONLY}" != "1" ]; then
     docker exec \
       ${DOCKER_CONTAINER} \
       /bin/bash -c \
-      "${SOURCE_DIR}/scripts/make_common.sh \"${PROJECT_BUILD_ARCH}\" \"${PROJECT_CMAKE_BUILD_TYPE}\" \"${PROJECT_BUILD_CLEAN}\" ${IS_MINGW} ${IS_UNIX}" || exit 1
+      "${PROJECT_SOURCE_DIR}/scripts/make_common.sh \"${PROJECT_BUILD_ARCH}\" \"${PROJECT_CMAKE_BUILD_TYPE}\" \"${PROJECT_BUILD_CLEAN}\" ${IS_MINGW} ${IS_UNIX}" || exit 1
   fi
 
   docker stop ${DOCKER_CONTAINER}
diff --git a/scripts/env.sh b/scripts/env.sh
index 6edf6161..b9e46867 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -7,11 +7,8 @@ PROJECT_IS_MINGW=$4
 PROJECT_IS_MINGW_UNIX=$5
 DISABLE_CREATE_DIRS=$6
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
-
-SOURCE_DIR=${CURRENT_DIR}/..
-SOURCE_DIR=$(realpath ${SOURCE_DIR})
+PROJECT_SOURCE_DIR=${PROJECT_SCRIPTS_DIR}/..
+PROJECT_SOURCE_DIR=$(realpath ${PROJECT_SOURCE_DIR})
 
 NUM_JOBS=${MY_NUM_JOBS}
 if [[ -z "${NUM_JOBS}" ]]; then
@@ -24,11 +21,11 @@ if [[ -z "${NUM_JOBS}" ]]; then
   fi
 fi
 
-pushd "${SOURCE_DIR}"
+pushd "${PROJECT_SOURCE_DIR}"
 
 PROJECT_GIT_REV=$(git rev-parse --short HEAD)
 
-. "${CURRENT_DIR}/options.sh"
+. "${PROJECT_SCRIPTS_DIR}/options.sh"
 
 for PROJECT_LIBRARY in "${PROJECT_LIBRARIES[@]}"; do
   ENABLE_NAME=PROJECT_ENABLE_${PROJECT_LIBRARY}
@@ -61,7 +58,7 @@ if [ "${PROJECT_IS_MINGW_UNIX}" == "" ]; then
   PROJECT_IS_MINGW_UNIX=0
 fi
 
-. "${SOURCE_DIR}/config.sh"
+. "${PROJECT_SOURCE_DIR}/config.sh"
 
 if [ "${PROJECT_ENABLE_SFML}" == "ON" ]; then
   PROJECT_ENABLE_FLAC=ON
@@ -149,8 +146,8 @@ else
   PROJECT_REQUIRE_ALPINE=OFF
 fi
 
-if [ -f "${SOURCE_DIR}/cmake/versions.cmake" ]; then
-  VERSIONS=($(sed -e s/\ /=/g -e s/set\(//g -e s/\)//g "${SOURCE_DIR}/cmake/versions.cmake"))
+if [ -f "${PROJECT_SOURCE_DIR}/cmake/versions.cmake" ]; then
+  VERSIONS=($(sed -e s/\ /=/g -e s/set\(//g -e s/\)//g "${PROJECT_SOURCE_DIR}/cmake/versions.cmake"))
 
   PROJECT_MINGW64_DOCKER_BUILD_ARGS=()
 
@@ -165,8 +162,8 @@ if [ -f "${SOURCE_DIR}/cmake/versions.cmake" ]; then
   PROJECT_MINGW64_DOCKER_BUILD_ARGS=${PROJECT_MINGW64_DOCKER_BUILD_ARGS[*]}
 fi
 
-PROJECT_BUILD_DIR=${SOURCE_DIR}/build/${PROJECT_CMAKE_BUILD_TYPE_LOWER}/${PROJECT_LINK_TYPE}
-PROJECT_DIST_DIR=${SOURCE_DIR}/dist/${PROJECT_CMAKE_BUILD_TYPE_LOWER}/${PROJECT_LINK_TYPE}
+PROJECT_BUILD_DIR=${PROJECT_SOURCE_DIR}/build/${PROJECT_CMAKE_BUILD_TYPE_LOWER}/${PROJECT_LINK_TYPE}
+PROJECT_DIST_DIR=${PROJECT_SOURCE_DIR}/dist/${PROJECT_CMAKE_BUILD_TYPE_LOWER}/${PROJECT_LINK_TYPE}
 
 if [ "${PROJECT_IS_MINGW}" == "1" ]; then
   PROJECT_DIST_DIR=${PROJECT_DIST_DIR}/win32
@@ -187,7 +184,7 @@ fi
 PROJECT_DIST_DIR=${PROJECT_DIST_DIR}/${PROJECT_NAME}
 
 PROJECT_EXTERNAL_BUILD_ROOT=${PROJECT_BUILD_DIR}/deps
-PROJECT_3RD_PARTY_DIR=${SOURCE_DIR}/support/3rd_party
+PROJECT_3RD_PARTY_DIR=${PROJECT_SOURCE_DIR}/support/3rd_party
 
 if [ "${PROJECT_ENABLE_OPENSSL}" == "ON" ]; then
   if [ "${PROJECT_IS_MINGW}" == "1" ] && [ "${PROJECT_IS_MINGW_UNIX}" == "1" ]; then
@@ -296,11 +293,11 @@ export PROJECT_RELEASE_ITER
 export PROJECT_RELEASE_NUM
 export PROJECT_REQUIRE_ALPINE
 export PROJECT_REVISION_VERSION
+export PROJECT_SOURCE_DIR
 export PROJECT_STATIC_LINK
 export PROJECT_TOOLCHAIN_FILE_CMAKE
 export PROJECT_TOOLCHAIN_FILE_MESON
 export PROJECT_URL
-export SOURCE_DIR
 
 for PROJECT_LIBRARY in "${PROJECT_LIBRARIES[@]}"; do
   ENABLE_NAME=PROJECT_ENABLE_${PROJECT_LIBRARY}
diff --git a/scripts/info.sh b/scripts/info.sh
index e9783fb2..72cd69f0 100755
--- a/scripts/info.sh
+++ b/scripts/info.sh
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
-
-SOURCE_DIR=${CURRENT_DIR}/..
-SOURCE_DIR=$(realpath ${SOURCE_DIR})
-
-. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1
diff --git a/scripts/make_common.sh b/scripts/make_common.sh
index 9c6cc599..fc701787 100755
--- a/scripts/make_common.sh
+++ b/scripts/make_common.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
-
-. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5"
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5"
 
 mkdir -p "${PROJECT_BUILD_DIR}/build"
 
@@ -12,8 +11,8 @@ if [ -d "${PROJECT_DIST_DIR}" ]; then
   mkdir -p "${PROJECT_DIST_DIR}"
 fi
 
-if [ -f "${SOURCE_DIR}/pre_build.sh" ]; then
-  "${SOURCE_DIR}/pre_build.sh"
+if [ -f "${PROJECT_SOURCE_DIR}/pre_build.sh" ]; then
+  "${PROJECT_SOURCE_DIR}/pre_build.sh"
 fi
 
 if [ "${PROJECT_IS_MINGW}" == "1" ]; then
@@ -21,7 +20,7 @@ if [ "${PROJECT_IS_MINGW}" == "1" ]; then
 fi
 
 pushd "${PROJECT_BUILD_DIR}"
-cmake "${SOURCE_DIR}" \
+cmake "${PROJECT_SOURCE_DIR}" \
   -G"Unix Makefiles" \
   -DPROJECT_COMPANY_NAME="${PROJECT_COMPANY_NAME}" \
   -DPROJECT_COPYRIGHT="${PROJECT_COPYRIGHT}" \
@@ -65,12 +64,12 @@ for APP in ${PROJECT_APP_LIST[@]}; do
       rsync -av --progress "${PROJECT_BUILD_DIR}/build/${APP}${APP_BINARY_EXT}" "${PROJECT_DIST_DIR}/bin/"
       cat <<EOF >>"${PROJECT_DIST_DIR}/${APP}${APP_BINARY_EXT}"
 #!/bin/sh
-CURRENT_DIR=\$(dirname "\$0")
-CURRENT_DIR=\$(realpath \${CURRENT_DIR})
+PROJECT_SCRIPTS_DIR=\$(dirname "\$0")
+PROJECT_SCRIPTS_DIR=\$(realpath \${PROJECT_SCRIPTS_DIR})
 
-export LD_LIBRARY_PATH="\${CURRENT_DIR}/lib:\${CURRENT_DIR}/lib64:\${LD_LIBRARY_PATH}"
+export LD_LIBRARY_PATH="\${PROJECT_SCRIPTS_DIR}/lib:\${PROJECT_SCRIPTS_DIR}/lib64:\${LD_LIBRARY_PATH}"
 
-\${CURRENT_DIR}/bin/${APP}${APP_BINARY_EXT} \$*
+\${PROJECT_SCRIPTS_DIR}/bin/${APP}${APP_BINARY_EXT} \$*
 EOF
       chmod +x "${PROJECT_DIST_DIR}/${APP}${APP_BINARY_EXT}"
     else
@@ -82,11 +81,11 @@ EOF
 done
 
 if [ "${PROJECT_IS_MINGW}" == "1" ]; then
-  . "${CURRENT_DIR}/copy_mingw64_deps.sh" "$1" "$2" "$3" "$4" "$5"
+  . "${PROJECT_SCRIPTS_DIR}/copy_mingw64_deps.sh" "$1" "$2" "$3" "$4" "$5"
 fi
 
-ln -sf "${PROJECT_BUILD_DIR}/build/compile_commands.json" "${SOURCE_DIR}/compile_commands.json"
+ln -sf "${PROJECT_BUILD_DIR}/build/compile_commands.json" "${PROJECT_SOURCE_DIR}/compile_commands.json"
 
-if [ -f "${SOURCE_DIR}/post_build.sh" ]; then
-  "${SOURCE_DIR}/post_build.sh"
+if [ -f "${PROJECT_SOURCE_DIR}/post_build.sh" ]; then
+  "${PROJECT_SOURCE_DIR}/post_build.sh"
 fi
diff --git a/scripts/make_package.sh b/scripts/make_package.sh
index cc0faf88..f1d973e2 100755
--- a/scripts/make_package.sh
+++ b/scripts/make_package.sh
@@ -3,10 +3,10 @@
 TEMP_DIR=$(mktemp -d)
 
 DEST_DIR=$1
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
 
-. "${CURRENT_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6"
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6"
 
 function error_exit() {
   echo $1
diff --git a/scripts/make_unix.sh b/scripts/make_unix.sh
index 3dbd5de1..fcc0c214 100755
--- a/scripts/make_unix.sh
+++ b/scripts/make_unix.sh
@@ -1,13 +1,12 @@
 #!/bin/bash
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" 0 0
 
-. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" 0 0
-
-if [ -f "${CURRENT_DIR}/cleanup.sh" ]; then
-  . "${CURRENT_DIR}/cleanup.sh" "$1" "$2" "$3" 0 0
-  rm ${CURRENT_DIR}/cleanup.*
+if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then
+  . "${PROJECT_SCRIPTS_DIR}/cleanup.sh" "$1" "$2" "$3" 0 0
+  rm ${PROJECT_SCRIPTS_DIR}/cleanup.*
 fi
 
 if [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ]; then
@@ -15,7 +14,7 @@ if [ "${PROJECT_REQUIRE_ALPINE}" == "ON" ]; then
   DOCKER_CONTAINER=${PROJECT_NAME}_${DOCKER_NAME}_${PROJECT_BUILD_ARCH}
   DOCKER_TAG=${PROJECT_NAME}:${DOCKER_NAME}
 
-  . "${CURRENT_DIR}/docker_common.sh" || exit 1
+  . "${PROJECT_SCRIPTS_DIR}/docker_common.sh" || exit 1
 else
-  "${SOURCE_DIR}/scripts/make_common.sh" "${PROJECT_BUILD_ARCH}" "${PROJECT_CMAKE_BUILD_TYPE}" "${PROJECT_BUILD_CLEAN}" 0 0 || exit 1
+  "${PROJECT_SOURCE_DIR}/scripts/make_common.sh" "${PROJECT_BUILD_ARCH}" "${PROJECT_CMAKE_BUILD_TYPE}" "${PROJECT_BUILD_CLEAN}" 0 0 || exit 1
 fi
diff --git a/scripts/make_win32.sh b/scripts/make_win32.sh
index 137cf82e..18feac2c 100755
--- a/scripts/make_win32.sh
+++ b/scripts/make_win32.sh
@@ -1,17 +1,16 @@
 #!/bin/bash
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" 1 1
 
-. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" 1 1
-
-if [ -f "${CURRENT_DIR}/cleanup.sh" ]; then
-  . "${CURRENT_DIR}/cleanup.sh" "$1" "$2" "$3" 1 1
-  rm ${CURRENT_DIR}/cleanup.*
+if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then
+  . "${PROJECT_SCRIPTS_DIR}/cleanup.sh" "$1" "$2" "$3" 1 1
+  rm ${PROJECT_SCRIPTS_DIR}/cleanup.*
 fi
 
 DOCKER_NAME=mingw64
 DOCKER_CONTAINER=${PROJECT_NAME}_${DOCKER_NAME}
 DOCKER_TAG=${PROJECT_NAME}:${DOCKER_NAME}
 
-. "${CURRENT_DIR}/docker_common.sh" || exit 1
+. "${PROJECT_SCRIPTS_DIR}/docker_common.sh" || exit 1
diff --git a/scripts/run_docker_shell.sh b/scripts/run_docker_shell.sh
index efe6df80..10bb2056 100755
--- a/scripts/run_docker_shell.sh
+++ b/scripts/run_docker_shell.sh
@@ -1,19 +1,18 @@
 #!/bin/bash
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
-
 DOCKER_NAME=$1
 
-. "${CURRENT_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" 1 1>/dev/null 2>&1
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" 1 1>/dev/null 2>&1
 
-if [ -f "${CURRENT_DIR}/cleanup.sh" ]; then
-  . "${CURRENT_DIR}/cleanup.sh" "$2" "$3" "$4" "$5" "$6"
-  rm ${CURRENT_DIR}/cleanup.*
+if [ -f "${PROJECT_SCRIPTS_DIR}/cleanup.sh" ]; then
+  . "${PROJECT_SCRIPTS_DIR}/cleanup.sh" "$2" "$3" "$4" "$5" "$6"
+  rm ${PROJECT_SCRIPTS_DIR}/cleanup.*
 fi
 
 DOCKER_CONTAINER=${PROJECT_NAME}_${DOCKER_NAME}_${PROJECT_BUILD_ARCH}_shell
 DOCKER_TAG=${PROJECT_NAME}:${DOCKER_NAME}
 DOCKER_SHELL=1
 
-. "${CURRENT_DIR}/docker_common.sh" || exit 1
+. "${PROJECT_SCRIPTS_DIR}/docker_common.sh" || exit 1
diff --git a/scripts/setup_msys2.sh b/scripts/setup_msys2.sh
index e1148efc..811a0367 100755
--- a/scripts/setup_msys2.sh
+++ b/scripts/setup_msys2.sh
@@ -1,11 +1,10 @@
 #!/bin/bash
 
-CURRENT_DIR=$(dirname "$0")
-CURRENT_DIR=$(realpath ${CURRENT_DIR})
-
 PROJECT_MSYS2_PACKAGE_LIST=()
 
-. "${CURRENT_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1> /dev/null 2>&1
+PROJECT_SCRIPTS_DIR=$(dirname "$0")
+PROJECT_SCRIPTS_DIR=$(realpath ${PROJECT_SCRIPTS_DIR})
+. "${PROJECT_SCRIPTS_DIR}/env.sh" "$1" "$2" "$3" "$4" "$5" 1 1>/dev/null 2>&1
 
 PROJECT_MSYS2_PACKAGE_LIST+=(
   mingw64/mingw-w64-x86_64-autotools