From 0d49b4948217535b6eeaf383ccd728e3ba3926aa Mon Sep 17 00:00:00 2001
From: "Scott E. Graves" <scott.e.graves@protonmail.com>
Date: Thu, 25 Jul 2024 06:49:11 -0500
Subject: [PATCH] updated build system

---
 scripts/deliver.sh      |  4 ----
 scripts/make_package.sh | 14 +++++++-------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/scripts/deliver.sh b/scripts/deliver.sh
index 4365a67a..f9f1b171 100755
--- a/scripts/deliver.sh
+++ b/scripts/deliver.sh
@@ -16,10 +16,6 @@ function error_exit() {
   exit $2
 }
 
-if [ ! -d "${PROJECT_DIST_DIR}" ]; then
-  error_exit "dist directory not found: ${PROJECT_DIST_DIR}" 2
-fi
-
 if [ "${DIST_DIR}" == "" ]; then
   DIST_DIR="${CURRENT_DIR}/../dist"
 fi
diff --git a/scripts/make_package.sh b/scripts/make_package.sh
index 34fc43f1..78bee19c 100755
--- a/scripts/make_package.sh
+++ b/scripts/make_package.sh
@@ -2,7 +2,7 @@
 
 TEMP_DIR=$(mktemp -d)
 
-DIST_DIR=$1
+DEST_DIR=$1
 CURRENT_DIR=$(dirname "$0")
 CURRENT_DIR=$(realpath ${CURRENT_DIR})
 
@@ -27,13 +27,13 @@ if [ ! -d "${PROJECT_DIST_DIR}" ]; then
   error_exit "dist directory not found: ${PROJECT_DIST_DIR}" 2
 fi
 
-if [ "${DIST_DIR}" == "" ]; then
-  DIST_DIR="${CURRENT_DIR}/../dist"
+if [ "${DEST_DIR}" == "" ]; then
+  DEST_DIR="${CURRENT_DIR}/../dist"
 fi
-DIST_DIR=$(realpath "${DIST_DIR}")
+DEST_DIR=$(realpath "${DEST_DIR}")
 
-if [ ! -d "${DIST_DIR}" ]; then
-  error_exit "dest directory not found: ${DIST_DIR}" 1
+if [ ! -d "${DEST_DIR}" ]; then
+  error_exit "dest directory not found: ${DEST_DIR}" 1
 fi
 
 rsync -av --progress ${PROJECT_DIST_DIR}/ ${TEMP_DIR}/${PROJECT_NAME}/ || error_exit "failed to rsync" 1
@@ -52,7 +52,7 @@ popd
 FILE_PART=${PROJECT_NAME}_${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_REVISION_VERSION}-${PROJECT_RELEASE_ITER}-${PROJECT_GIT_REV}_${PROJECT_BUILD_ARCH}_${PROJECT_OS}
 OUT_FILE=${FILE_PART}.tar.gz
 
-pushd "${DIST_DIR}"
+pushd "${DEST_DIR}"
 tar cvzf "${OUT_FILE}" -C ${TEMP_DIR} . || error_exit "failed to create archive: ${OUT_FILE}" 1
 create_file_validations "${OUT_FILE}"
 popd