From 82e2484c01acab8d8ce40667e8a03e3b7e7e5113 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sun, 13 Aug 2017 23:19:03 +0200 Subject: [PATCH] Throw an error if the output directory does not exist --- packaging/osx/buildpackage.sh | 6 ++++++ packaging/windows/buildpackage.sh | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh index 9053178..b4ca628 100755 --- a/packaging/osx/buildpackage.sh +++ b/packaging/osx/buildpackage.sh @@ -58,6 +58,11 @@ if [ ! -f "${ENGINE_DIRECTORY}/Makefile" ]; then exit 1 fi +if [ ! -d "${OUTPUTDIR}" ]; then + echo "Output directory '${OUTPUTDIR}' does not exist."; + exit 1 +fi + make version VERSION="${TAG}" pushd ${ENGINE_DIRECTORY} > /dev/null @@ -83,6 +88,7 @@ modify_plist "{JOIN_SERVER_URL_SCHEME}" "openra-${MOD_ID}-${TAG}" "${PACKAGING_O echo "Packaging zip archive" zip "${PACKAGING_INSTALLER_NAME}-${TAG}" -r -9 "${PACKAGING_OSX_APP_NAME}" --quiet --symlinks + mv "${PACKAGING_INSTALLER_NAME}-${TAG}.zip" ${OUTPUTDIR} popd > /dev/null diff --git a/packaging/windows/buildpackage.sh b/packaging/windows/buildpackage.sh index 023c488..4269ba4 100755 --- a/packaging/windows/buildpackage.sh +++ b/packaging/windows/buildpackage.sh @@ -45,6 +45,11 @@ if [ ! -f "${ENGINE_DIRECTORY}/Makefile" ]; then exit 1 fi +if [ ! -d "${OUTPUTDIR}" ]; then + echo "Output directory '${OUTPUTDIR}' does not exist."; + exit 1 +fi + make version VERSION="${TAG}" pushd ${ENGINE_DIRECTORY} > /dev/null