updated build system

This commit is contained in:
Scott E. Graves 2024-07-25 06:49:11 -05:00
parent 753820bd81
commit 0d49b49482
2 changed files with 7 additions and 11 deletions

View File

@ -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

View File

@ -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