From 416ff84aab5917eafde15388bda56359fe631259 Mon Sep 17 00:00:00 2001
From: "Kevin M. Cox" <kevin.cox@doordash.com>
Date: Thu, 27 Jun 2024 14:54:11 -0500
Subject: [PATCH 1/2] Update GitHubCLI.munki.recipe

Adds the Munki `supported_architectures` array.
---
 GitHub/GitHubCLI.munki.recipe | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/GitHub/GitHubCLI.munki.recipe b/GitHub/GitHubCLI.munki.recipe
index bdecd22f..1d23b086 100644
--- a/GitHub/GitHubCLI.munki.recipe
+++ b/GitHub/GitHubCLI.munki.recipe
@@ -3,7 +3,9 @@
 <plist version="1.0">
 <dict>
 	<key>Description</key>
-	<string>Downloads the latest version of the GitHub command line tool and imports it into Munki.</string>
+	<string>Downloads the latest version of the GitHub command line tool and imports it into Munki.
+	
+Valid options for SUPPORTED_ARCH input variable are "x86_64" for Intel (defualt) or "arm64" for Apple Silicon.</string>
 	<key>Identifier</key>
 	<string>com.github.homebysix.munki.GitHubCLI</string>
 	<key>Input</key>
@@ -12,6 +14,8 @@
 		<string>apps/GitHub</string>
 		<key>NAME</key>
 		<string>GitHub CLI</string>
+		<key>SUPPORTED_ARCH</key>
+		<string>x86_64</string>
 		<key>pkginfo</key>
 		<dict>
 			<key>catalogs</key>
@@ -26,6 +30,10 @@
 			<string>GitHub CLI</string>
 			<key>name</key>
 			<string>%NAME%</string>
+			<key>supported_architectures</key>
+			<array>
+				<string>%SUPPORTED_ARCH%</string>
+			</array>
 			<key>unattended_install</key>
 			<true/>
 			<key>unattended_uninstall</key>

From 3d7c015e40ffc76a5154582338accf385188882d Mon Sep 17 00:00:00 2001
From: "Kevin M. Cox" <kevin.cox@doordash.com>
Date: Mon, 1 Jul 2024 14:59:06 -0500
Subject: [PATCH 2/2] Update GitHubCLI.munki.recipe

This commit pivots to using the `FindAndReplace` processor to convert the architecture variable instead of requiring it to be specified independently.
---
 GitHub/GitHubCLI.munki.recipe | 33 ++++++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 9 deletions(-)

diff --git a/GitHub/GitHubCLI.munki.recipe b/GitHub/GitHubCLI.munki.recipe
index 1d23b086..fd90cf8d 100644
--- a/GitHub/GitHubCLI.munki.recipe
+++ b/GitHub/GitHubCLI.munki.recipe
@@ -3,9 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>Description</key>
-	<string>Downloads the latest version of the GitHub command line tool and imports it into Munki.
-	
-Valid options for SUPPORTED_ARCH input variable are "x86_64" for Intel (defualt) or "arm64" for Apple Silicon.</string>
+	<string>Downloads the latest version of the GitHub command line tool and imports it into Munki.</string>
 	<key>Identifier</key>
 	<string>com.github.homebysix.munki.GitHubCLI</string>
 	<key>Input</key>
@@ -14,8 +12,6 @@ Valid options for SUPPORTED_ARCH input variable are "x86_64" for Intel (defualt)
 		<string>apps/GitHub</string>
 		<key>NAME</key>
 		<string>GitHub CLI</string>
-		<key>SUPPORTED_ARCH</key>
-		<string>x86_64</string>
 		<key>pkginfo</key>
 		<dict>
 			<key>catalogs</key>
@@ -30,10 +26,6 @@ Valid options for SUPPORTED_ARCH input variable are "x86_64" for Intel (defualt)
 			<string>GitHub CLI</string>
 			<key>name</key>
 			<string>%NAME%</string>
-			<key>supported_architectures</key>
-			<array>
-				<string>%SUPPORTED_ARCH%</string>
-			</array>
 			<key>unattended_install</key>
 			<true/>
 			<key>unattended_uninstall</key>
@@ -46,6 +38,19 @@ Valid options for SUPPORTED_ARCH input variable are "x86_64" for Intel (defualt)
 	<string>com.github.homebysix.pkg.GitHubCLI</string>
 	<key>Process</key>
 	<array>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>find</key>
+				<string>amd64</string>
+				<key>input_string</key>
+				<string>%ARCH%</string>
+				<key>replace</key>
+				<string>x86_64</string>
+			</dict>
+			<key>Processor</key>
+			<string>com.github.homebysix.FindAndReplace/FindAndReplace</string>
+		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
@@ -60,6 +65,16 @@ Valid options for SUPPORTED_ARCH input variable are "x86_64" for Intel (defualt)
 			<string>MunkiInstallsItemsCreator</string>
 		</dict>
 		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>additional_pkginfo</key>
+				<dict>
+					<key>supported_architectures</key>
+						<array>
+							<string>%output_string%</string>
+						</array>
+				</dict>
+			</dict>
 			<key>Processor</key>
 			<string>MunkiPkginfoMerger</string>
 		</dict>