Branch: refs/heads/master Author: Jiří Techet techet@gmail.com Committer: Jiří Techet techet@gmail.com Date: Tue, 07 Jun 2022 18:58:56 UTC Commit: 3bd2c196928797e318a4f8a74e568b6e077fd2d2 https://github.com/geany/geany-osx/commit/3bd2c196928797e318a4f8a74e568b6e07...
Log Message: ----------- Use notarytool instead of deprecated altool for notarization
Modified Paths: -------------- notarize.sh
Modified: notarize.sh 29 lines changed, 3 insertions(+), 26 deletions(-) =================================================================== @@ -1,11 +1,8 @@ #!/bin/sh -# -# Modified version of -# https://github.com/thommcgrath/Beacon/blob/master/Installers/Mac/Build.sh
DMGFILE="${1}" APPLEID="${2}" -BUNDLEID="org.geany.geany" +TEAMID=$(echo $SIGN_CERTIFICATE | sed -n 's/Developer ID Application: .* ((.*))/\1/p')
# App-specific password, see https://support.apple.com/en-us/HT204397 stty -echo @@ -14,25 +11,5 @@ read PASSWORD stty echo printf "\n"
-echo "Uploading disk image for notarization. This can take a while."; -xcrun altool --notarize-app -f "${DMGFILE}" --primary-bundle-id "${BUNDLEID}" -u "${APPLEID}" -p "${PASSWORD}" > ${TMPDIR}notarize_output 2>&1 || { cat ${TMPDIR}notarize_output; rm -f ${TMPDIR}notarize_output; exit $?; }; -cat ${TMPDIR}notarize_output; -REQUESTUUID=$(sed -n 's/RequestUUID = (.*)/\1/p' ${TMPDIR}notarize_output); -echo "Disk image has been uploaded. Request UUID is ${REQUESTUUID}. Checking status every 10 seconds:"; -STATUS="in progress"; -while [ "${STATUS}" = "in progress" ]; do - sleep 10; - xcrun altool --notarization-info "${REQUESTUUID}" -u "${APPLEID}" -p "${PASSWORD}" > ${TMPDIR}notarize_output 2>&1 || { cat ${TMPDIR}notarize_output; rm -f ${TMPDIR}notarize_output; echo "Failed to check on notarization status."; exit $?; }; - STATUS=$(sed -ne 's/^[[:space:]]*Status: (.*)$/\1/p' ${TMPDIR}notarize_output); - echo "Status: ${STATUS}" -done; -if [ "${STATUS}" = "success" ]; then - echo "Stapling file."; - xcrun stapler staple "${DMGFILE}"; -else - cat ${TMPDIR}notarize_output; - rm -f ${TMPDIR}notarize_output; - echo "Disk image WAS NOT NOTARIZED, status is ${STATUS}."; - exit 1; -fi; -rm -f ${TMPDIR}notarize_output; +xcrun notarytool submit "${DMGFILE}" --wait --apple-id "${APPLEID}" --password "${PASSWORD}" --team-id "${TEAMID}" && xcrun stapler staple "${DMGFILE}"; +
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).