From b87e20ca7ea53bff3fa12691c2a3d17104e06516 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Mon, 4 Nov 2019 10:38:45 +0100
Subject: [PATCH] prepare release now works

---
 scripts/prepare_release.sh | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/scripts/prepare_release.sh b/scripts/prepare_release.sh
index 5e14d851..74c1db6e 100755
--- a/scripts/prepare_release.sh
+++ b/scripts/prepare_release.sh
@@ -52,13 +52,20 @@ if [[ -z "${PASSWORD}" ]]; then
     exit -1
 fi
 
-BUILD_FOLDER="${TMPDIR}"
+DERIVED_DATA_FOLDER="${TMPDIR}"
+BUILD_FOLDER="${DERIVED_DATA_FOLDER}"/Build/Products/Release
 APP_BUNDLE=MacPass.app
 APP_BUNDLE_ZIP="${APP_BUNDLE}".zip
 cd ..
-xcodebuild build -configuration Release -project MacPass.xcodeproj -scheme MacPass CODE_SIGNING_REQUIRED=NO -derivedDataPath "${BUILD_FOLDER}"
+echo "Building..."
+xcodebuild build -configuration Release -project MacPass.xcodeproj -scheme MacPass CODE_SIGNING_REQUIRED=NO -derivedDataPath "${DERIVED_DATA_FOLDER}"
 cd "${BUILD_FOLDER}"
-echo codesign --sign "${IDENTITY}" --options runtime --deep --force --entitlements "${ENTITLEMENTS}" "${APP_BUNDLE}"
-echo ditto -c -k --keepParent "${APP_BUNDLE}" "${APP_BUNDLE_ZIP}"
+echo ""
+echo "Signing..."
+codesign --sign "${IDENTITY}" --options runtime --deep --force --entitlements "${ENTITLEMENTS}" "${APP_BUNDLE}"
+echo ""
+echo "Archiving..."
+ditto -c -k --keepParent "${APP_BUNDLE}" "${APP_BUNDLE_ZIP}"
+echo "Requesting Notarization..."
 xcrun altool --notarize-app --primary-bundle-id "com.hicknhacksoftware.MacPass.zip" --username "${USERNAME}" --password "${PASSWORD}" --file "${APP_BUNDLE_ZIP}"
 #xcrun stapler staple "${APP_BUNDLE}"