From 68c9ec0f82ec82b0c277218cf86f2f19c3d4fec4 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Tue, 9 Jul 2024 14:28:39 -0500 Subject: [PATCH] updated build system --- scripts/make_package.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/make_package.sh b/scripts/make_package.sh index a270f322..4828bc1a 100644 --- a/scripts/make_package.sh +++ b/scripts/make_package.sh @@ -1,12 +1,12 @@ #!/bin/bash -DEST_DIR=$(realpath $2) TEMP_DIR=$(mktemp -d) +DEST_DIR=$1 CURRENT_DIR=$(dirname "$0") CURRENT_DIR=$(realpath ${CURRENT_DIR}) -. "${CURRENT_DIR}/env.sh" "$3" "$4" "$5" "$6" "$7" +. "${CURRENT_DIR}/env.sh" "$2" "$3" "$4" "$5" "$6" if [ -f "${CURRENT_DIR}/../build/version.sh" ]; then source ${CURRENT_DIR}/../build/version.sh @@ -37,13 +37,18 @@ if [ ! -d "${PROJECT_DIST_DIR}" ]; then exit 1 fi -if [ "${DEST_DIR}" == "" ] || [ ! -d "${DEST_DIR}" ]; then +if [ "${DEST_DIR}" == "" ]; then + DEST_DIR="${CURRENT_DIR}/../dist" +fi +DEST_DIR=$(realpath "${DEST_DIR}") + +if [ ! -d "${DEST_DIR}" ]; then echo "Destination directory not found: ${DEST_DIR}" exit 1 fi -PACKAGE_ROOT=${PROJECT_DIST_DIR}/.. -PACKAGE_ROOT=$(realpath ${PACKAGE_ROOT}) +PACKAGE_ROOT="${PROJECT_DIST_DIR}/.." +PACKAGE_ROOT=$(realpath "${PACKAGE_ROOT}") rsync -av --progress ${PACKAGE_ROOT}/ ${TEMP_DIR}/ || exit_and_clean "Failed to rsync" 1