13
0

macos: change password method for altool from @keychain to @env

This commit is contained in:
Paul Davis 2023-09-21 07:11:38 -06:00
parent 0d8e783d25
commit b59e1f936d

View File

@ -877,7 +877,7 @@ checkForSuccess() {
xcrun altool \ xcrun altool \
--notarization-info $1 \ --notarization-info $1 \
-u ${ALTOOL_USERNAME} \ -u ${ALTOOL_USERNAME} \
--password "@keychain:ALTOOL_PASSWORD" \ --password "@env:ALTOOL_PASSWORD" \
2>&1 | grep -o "Status: success"; 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 ZIP_PATH=${PRODUCT_PKG_DIR}/${BUNDLENAME}.zip
/usr/bin/ditto -c -k --keepParent ${PRODUCT_PKG_DIR}/${APPDIR} $ZIP_PATH /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 if [ $? = 0 ]; then
REQUEST_ID=$(echo ${notarize_output} | awk '{print $3}') 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 ZIP_PATH=${PRODUCT_PKG_DIR}/Jadeo.zip
/usr/bin/ditto -c -k --keepParent ${PRODUCT_PKG_DIR}/Jadeo.app $ZIP_PATH /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 if [ $? = 0 ]; then
REQUEST_ID=$(echo ${notarize_output} | awk '{print $3}') REQUEST_ID=$(echo ${notarize_output} | awk '{print $3}')
@ -1148,7 +1148,7 @@ if test -n "${APPLE_DEVELOPER_ID_FOR_APPLICATION}"; then
echo "dmg: notarizing" echo "dmg: notarizing"
OK=0 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 if [ $? = 0 ]; then
REQUEST_ID=$(echo ${notarize_output} | awk '{print $3}') REQUEST_ID=$(echo ${notarize_output} | awk '{print $3}')