@@ -34,10 +34,8 @@ GITHUB_REPO="diffplug/mouseterm"
3434# Stable filenames for release assets
3535FNAME_WIN_EXE=" MouseTerm-windows-x64.exe"
3636FNAME_WIN_UPDATE=" MouseTerm-windows-x64.nsis.zip"
37- FNAME_MAC_ARM_DMG=" MouseTerm-macos-aarch64.dmg"
38- FNAME_MAC_ARM_UPDATE=" MouseTerm-macos-aarch64.tar.gz"
39- FNAME_MAC_INTEL_DMG=" MouseTerm-macos-x86_64.dmg"
40- FNAME_MAC_INTEL_UPDATE=" MouseTerm-macos-x86_64.tar.gz"
37+ FNAME_MAC_DMG=" MouseTerm-macos-aarch64.dmg"
38+ FNAME_MAC_UPDATE=" MouseTerm-macos-aarch64.tar.gz"
4139FNAME_LINUX_APPIMAGE=" MouseTerm-linux-x86_64.AppImage"
4240FNAME_LINUX_UPDATE=" MouseTerm-linux-x86_64.AppImage.tar.gz"
4341FNAME_LINUX_DEB=" MouseTerm-linux-x86_64.deb"
@@ -306,14 +304,10 @@ sign_macos_app() {
306304sign_macos () {
307305 log " Starting macOS code signing..."
308306
309- # Find and sign both arch builds
310- local aarch64_app
311- aarch64_app=$( find " $WORK_DIR /standalone-mac-aarch64" " *.app" | head -1)
312- local x86_64_app
313- x86_64_app=$( find " $WORK_DIR /standalone-mac-x86_64" " *.app" | head -1)
307+ local app
308+ app=$( find " $WORK_DIR /standalone-mac-aarch64" " *.app" | head -1)
314309
315- [[ -n " $aarch64_app " && sign_macos_app " $aarch64_app " " aarch64"
316- [[ -n " $x86_64_app " && sign_macos_app " $x86_64_app " " x86_64"
310+ [[ -n " $app " && sign_macos_app " $app " " aarch64"
317311
318312 log " All macOS signing complete"
319313}
@@ -354,38 +348,23 @@ notarize_macos() {
354348 check_command xcrun " xcode-select --install"
355349 prompt_secret APPLE_SIGN_PASS " Enter Apple ID password (or app-specific password)"
356350
357- local aarch64_app
358- aarch64_app=$( find " $WORK_DIR /standalone-mac-aarch64" " *.app" | head -1)
359- local x86_64_app
360- x86_64_app=$( find " $WORK_DIR /standalone-mac-x86_64" " *.app" | head -1)
351+ local app
352+ app=$( find " $WORK_DIR /standalone-mac-aarch64" " *.app" | head -1)
361353
362- [[ -n " $aarch64_app " && notarize_macos_app " $aarch64_app " " aarch64"
363- [[ -n " $x86_64_app " && notarize_macos_app " $x86_64_app " " x86_64"
364-
365- # Re-package signed+notarized apps into .dmg and .tar.gz
366- for arch in aarch64 x86_64; do
367- local app
368- app=$( find " $WORK_DIR /standalone-mac-${arch} " " *.app" | head -1)
369- [[ -z " $app " && continue
354+ [[ -n " $app " && notarize_macos_app " $app " " aarch64"
370355
356+ # Re-package signed+notarized app into .dmg and .tar.gz
357+ if [[ -n " $app " ; then
371358 local app_name
372359 app_name=$( basename " $app " )
373360
374- if [[ " $arch " == " aarch64" ; then
375- local dmg_name=" $FNAME_MAC_ARM_DMG "
376- local tar_name=" $FNAME_MAC_ARM_UPDATE "
377- else
378- local dmg_name=" $FNAME_MAC_INTEL_DMG "
379- local tar_name=" $FNAME_MAC_INTEL_UPDATE "
380- fi
381-
382- log " Creating $dmg_name ..."
361+ log " Creating $FNAME_MAC_DMG ..."
383362 hdiutil create -volname " MouseTerm" " $app "
384- -ov -format UDZO " $WORK_DIR /$dmg_name "
363+ -ov -format UDZO " $WORK_DIR /$FNAME_MAC_DMG "
385364
386- log " Creating $tar_name ..."
387- tar -czf " $WORK_DIR /$tar_name " " $( dirname " $app " ) " " $app_name "
388- done
365+ log " Creating $FNAME_MAC_UPDATE ..."
366+ tar -czf " $WORK_DIR /$FNAME_MAC_UPDATE " " $( dirname " $app " ) " " $app_name "
367+ fi
389368
390369 log " All macOS notarization and packaging complete"
391370}
@@ -452,10 +431,8 @@ sign_updates() {
452431
453432 # Collect and rename update bundles with stable filenames
454433 # macOS .tar.gz (already created by notarize step)
455- [[ -f " $WORK_DIR /$FNAME_MAC_ARM_UPDATE " && cp " $WORK_DIR /$FNAME_MAC_ARM_UPDATE " " $release_dir /"
456- [[ -f " $WORK_DIR /$FNAME_MAC_INTEL_UPDATE " && cp " $WORK_DIR /$FNAME_MAC_INTEL_UPDATE " " $release_dir /"
457- [[ -f " $WORK_DIR /$FNAME_MAC_ARM_DMG " && cp " $WORK_DIR /$FNAME_MAC_ARM_DMG " " $release_dir /"
458- [[ -f " $WORK_DIR /$FNAME_MAC_INTEL_DMG " && cp " $WORK_DIR /$FNAME_MAC_INTEL_DMG " " $release_dir /"
434+ [[ -f " $WORK_DIR /$FNAME_MAC_UPDATE " && cp " $WORK_DIR /$FNAME_MAC_UPDATE " " $release_dir /"
435+ [[ -f " $WORK_DIR /$FNAME_MAC_DMG " && cp " $WORK_DIR /$FNAME_MAC_DMG " " $release_dir /"
459436
460437 # Windows NSIS zip — rebuild with signed exe so Tauri auto-update gets the signed binary
461438 local win_nsis
@@ -502,8 +479,7 @@ sign_updates() {
502479 [[ -n " $linux_deb " && cp " $linux_deb " " $release_dir /$FNAME_LINUX_DEB "
503480
504481 # Generate .sig files for update bundles using Tauri CLI
505- for bundle in " $release_dir /$FNAME_MAC_ARM_UPDATE "
506- " $release_dir /$FNAME_MAC_INTEL_UPDATE "
482+ for bundle in " $release_dir /$FNAME_MAC_UPDATE "
507483 " $release_dir /$FNAME_WIN_UPDATE "
508484 " $release_dir /$FNAME_LINUX_UPDATE " ; do
509485 if [[ -f " $bundle " ; then
@@ -523,9 +499,8 @@ sign_updates() {
523499 pub_date=$( date -u ' +%Y-%m-%dT%H:%M:%SZ' )
524500
525501 # Read .sig file contents
526- local sig_mac_arm=" " " " " " " "
527- [[ -f " $release_dir /$FNAME_MAC_ARM_UPDATE .sig" && sig_mac_arm=$( cat " $release_dir /$FNAME_MAC_ARM_UPDATE .sig" )
528- [[ -f " $release_dir /$FNAME_MAC_INTEL_UPDATE .sig" && sig_mac_intel=$( cat " $release_dir /$FNAME_MAC_INTEL_UPDATE .sig" )
502+ local sig_mac=" " " " " "
503+ [[ -f " $release_dir /$FNAME_MAC_UPDATE .sig" && sig_mac=$( cat " $release_dir /$FNAME_MAC_UPDATE .sig" )
529504 [[ -f " $release_dir /$FNAME_WIN_UPDATE .sig" && sig_win=$( cat " $release_dir /$FNAME_WIN_UPDATE .sig" )
530505 [[ -f " $release_dir /$FNAME_LINUX_UPDATE .sig" && sig_linux=$( cat " $release_dir /$FNAME_LINUX_UPDATE .sig" )
531506
@@ -536,12 +511,8 @@ sign_updates() {
536511 "pub_date": "$pub_date ",
537512 "platforms": {
538513 "darwin-aarch64": {
539- "url": "$base_url /$FNAME_MAC_ARM_UPDATE ",
540- "signature": "$sig_mac_arm "
541- },
542- "darwin-x86_64": {
543- "url": "$base_url /$FNAME_MAC_INTEL_UPDATE ",
544- "signature": "$sig_mac_intel "
514+ "url": "$base_url /$FNAME_MAC_UPDATE ",
515+ "signature": "$sig_mac "
545516 },
546517 "windows-x86_64": {
547518 "url": "$base_url /$FNAME_WIN_UPDATE ",
0 commit comments