From 6901800b7a4cf870b88bc098fd47d413d1b4fdf7 Mon Sep 17 00:00:00 2001
From: Marc Culler <culler@users.noreply.github.com>
Date: Sun, 8 Oct 2023 13:25:59 -0500
Subject: [PATCH] Update package build.

---
 Makefile                 |  3 +++
 package/build_package.sh | 13 +++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 1bec231..36eb38a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,8 @@
 CFLAGS=-arch x86_64 -arch arm64 -mmacosx-version-min=10.6
 
+.PHONY:
+	 package
+
 macher: append_data.o macher.h macher.c
 	gcc ${CFLAGS} -o macher append_data.o macher.c
 
diff --git a/package/build_package.sh b/package/build_package.sh
index e633ca0..e49aca8 100755
--- a/package/build_package.sh
+++ b/package/build_package.sh
@@ -1,15 +1,16 @@
 #!/bin/bash
 source IDs.sh
-PKG_ID=1_4
-VERSION=1.4
+PKG_ID=1_6
+VERSION=1.6
+OPTIONS="--wait --no-progress --apple-id $APPLE_ID \
+--team-id $DEV_ID --password $ONE_TIME_PASS --wait"
 
 mkdir -p bin
 cp ../macher bin
 codesign -v -s $DEV_ID --timestamp --options runtime --force bin/macher
-pkgbuild --root bin --identifier info.marc-culler.macher.$PKG_ID --version $VERSION --install-location /usr/local/bin bin.pkg
+pkgbuild --root bin --identifier info.marc-culler.macher.$PKG_ID \
+    --install-location /usr/local/bin bin.pkg
 productsign --sign $DEV_ID bin.pkg macher.pkg
 rm -f bin.pkg
-xcrun altool --notarize-app --primary-bundle-id "macher-$VERSION" --username $USERNAME --password $ONE_TIME_PASS --file macher.pkg
-echo Waiting 90 seconds ...
-sleep 90
+xcrun notarytool submit $OPTIONS macher.pkg
 xcrun stapler staple macher.pkg