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.
autopkg · Jul 1, 2024 · 3d7c015 · 3d7c015
1 parent 416ff84
commit 3d7c015
Showing 1 changed file with 24 additions and 9 deletions.
diff --git 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>