From 4856ceef7e69bf38cf7ea0d714f8794a1a78d6fd Mon Sep 17 00:00:00 2001
From: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
Date: Tue, 19 Nov 2024 07:15:10 -0500
Subject: [PATCH] Improve script modularity:

`script/package` calls
`script/build --universal` instead of requiring the latter to be called before the former.

Partial #638

Signed-off-by: Ross Goldberg <484615+rgoldberg@users.noreply.github.com>
---
 .github/workflows/release.yml | 6 +-----
 script/package                | 2 ++
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ac663a253..afaaa0f37 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -36,11 +36,7 @@ jobs:
         run: |
           script/bootstrap -f
 
-      - name: 🏗️ Build universal executable
-        run: |
-          script/build --universal
-
-      - name: 📦 Package mas.pkg
+      - name: 📦 Build universal executable & package it in mas.pkg
         run: |
           script/package
 
diff --git a/script/package b/script/package
index d5183dd0d..fc299231f 100755
--- a/script/package
+++ b/script/package
@@ -18,6 +18,8 @@ distribution_package="${build_dir}/mas.pkg"
 distributions_root="${build_dir}/distributions"
 version="$(script/version)"
 
+script/build --universal
+
 ditto -v "${build_dir}/apple/Products/Release/mas" "${distributions_root}/usr/local/bin/mas"
 
 printf $'==> 📦 Assembling installer package for mas %s\n' "${version}"