From b59e1f936d5d590381358b0a61361e5df53bdaf0 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 21 Sep 2023 07:11:38 -0600
Subject: [PATCH] macos: change password method for altool from @keychain to
 @env

---
 tools/osx_packaging/osx_build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/osx_packaging/osx_build b/tools/osx_packaging/osx_build
index 5aa2b14a2c..bff7678f29 100755
--- a/tools/osx_packaging/osx_build
+++ b/tools/osx_packaging/osx_build
@@ -877,7 +877,7 @@ checkForSuccess() {
 	xcrun altool \
 		--notarization-info $1 \
 		-u ${ALTOOL_USERNAME} \
-		--password "@keychain:ALTOOL_PASSWORD" \
+		--password "@env:ALTOOL_PASSWORD" \
 		2>&1 | grep -o "Status: success";
 }
 
@@ -917,7 +917,7 @@ if test -n "${APPLE_DEVELOPER_ID_FOR_APPLICATION}"; then
 		ZIP_PATH=${PRODUCT_PKG_DIR}/${BUNDLENAME}.zip
 		/usr/bin/ditto -c -k --keepParent ${PRODUCT_PKG_DIR}/${APPDIR} $ZIP_PATH
 
-		notarize_output=$(xcrun altool --notarize-app --primary-bundle-id "${BUNDLE_ID_BASE}.${lower_case_appname}${major_version}.zip" --username ${ALTOOL_USERNAME} --password "@keychain:ALTOOL_PASSWORD" --file $ZIP_PATH 2>&1 | grep -o "RequestUUID = .*")
+		notarize_output=$(xcrun altool --notarize-app --primary-bundle-id "${BUNDLE_ID_BASE}.${lower_case_appname}${major_version}.zip" --username ${ALTOOL_USERNAME} --password "@env:ALTOOL_PASSWORD" --file $ZIP_PATH 2>&1 | grep -o "RequestUUID = .*")
 
 		if [ $? = 0 ]; then
 			REQUEST_ID=$(echo ${notarize_output} | awk '{print $3}')
@@ -973,7 +973,7 @@ if test -n "${APPLE_DEVELOPER_ID_FOR_APPLICATION}"; then
 		ZIP_PATH=${PRODUCT_PKG_DIR}/Jadeo.zip
 		/usr/bin/ditto -c -k --keepParent ${PRODUCT_PKG_DIR}/Jadeo.app $ZIP_PATH
 
-		notarize_output=$(xcrun altool --notarize-app --primary-bundle-id "${BUNDLE_ID_BASE}.jadeo.zip" --username ${ALTOOL_USERNAME} --password "@keychain:ALTOOL_PASSWORD" --file $ZIP_PATH 2>&1 | grep -o "RequestUUID = .*")
+		notarize_output=$(xcrun altool --notarize-app --primary-bundle-id "${BUNDLE_ID_BASE}.jadeo.zip" --username ${ALTOOL_USERNAME} --password "@env:ALTOOL_PASSWORD" --file $ZIP_PATH 2>&1 | grep -o "RequestUUID = .*")
 
 		if [ $? = 0 ]; then
 			REQUEST_ID=$(echo ${notarize_output}  | awk '{print $3}')
@@ -1148,7 +1148,7 @@ if test -n "${APPLE_DEVELOPER_ID_FOR_APPLICATION}"; then
 		echo "dmg: notarizing"
 		OK=0
 
-		notarize_output=$(xcrun altool --notarize-app --primary-bundle-id "${BUNDLE_ID_BASE}.${lower_case_appname}${major_version}.dmg" --username ${ALTOOL_USERNAME} --password "@keychain:ALTOOL_PASSWORD" --file ${UC_DMG} 2>&1 | grep -o "RequestUUID = .*")
+		notarize_output=$(xcrun altool --notarize-app --primary-bundle-id "${BUNDLE_ID_BASE}.${lower_case_appname}${major_version}.dmg" --username ${ALTOOL_USERNAME} --password "@env:ALTOOL_PASSWORD" --file ${UC_DMG} 2>&1 | grep -o "RequestUUID = .*")
 
 		if [ $? = 0 ]; then
 			REQUEST_ID=$(echo ${notarize_output}  | awk '{print $3}')