Update GNS3 Recipes

- Adds support for downloading the intel version. See GNS3/gns3-gui#3593 for further info.
autopkg · Jul 12, 2024 · 8a3ee71 · 8a3ee71
1 parent 5b07ab9
commit 8a3ee71
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/GNS3/GNS3.download.recipe b/GNS3/GNS3.download.recipe
@@ -6,13 +6,18 @@
     <string>Downloads the latest version of GNS3.
 Set PRERELEASE to a non-empty string to download prereleases, either
 via Input in an override or via the -k option,
-i.e.: `-k PRERELEASE=yes`</string>
+i.e.: `-k PRERELEASE=yes`
+
+To download Apple Silicon use: "" in the DOWNLOAD_ARCH variable
+To download Intel use: "-intel" in the DOWNLOAD_ARCH variable</string>
     <key>Identifier</key>
     <string>com.github.dataJAR-recipes.download.GNS3</string>
     <key>Input</key>
     <dict>
         <key>PRERELEASE</key>
         <string></string>
+        <key>DOWNLOAD_ARCH</key>
+        <string></string>
         <key>NAME</key>
         <string>GNS3</string>
     </dict>
@@ -30,7 +35,7 @@ i.e.: `-k PRERELEASE=yes`</string>
                 <key>include_prereleases</key>
                 <string>%PRERELEASE%</string>
                 <key>asset_regex</key>
-                <string>GNS3-.*?\.dmg$</string>
+                <string>GNS3-([0-9]+(\.[0-9]+)+)%DOWNLOAD_ARCH%\.dmg$</string>
             </dict>
         </dict>
         <dict>

diff --git a/GNS3/GNS3.munki.recipe b/GNS3/GNS3.munki.recipe
@@ -5,15 +5,16 @@
     <key>Description</key>
     <string>Downloads the latest version of GNS3 and imports it into Munki.
 
-Due to CircleCI deprecating x86_64 Mac instances as of v2.2.48 GNS3 is arm64 only.
-
-See: https://gns3.com/community/blog/gns3-2-2-48-released and https://github.com/GNS3/gns3-gui/issues/3593</string>
+For Intel use: "x86_64" in the SUPPORTED_ARCH variable
+For Apple Silicon use: "arm64" in the SUPPORTED_ARCH variable</string>
     <key>Identifier</key>
     <string>com.github.dataJAR-recipes.munki.GNS3</string>
     <key>Input</key>
     <dict>
         <key>MUNKI_REPO_SUBDIR</key>
         <string>apps/%NAME%</string>
+        <key>SUPPORTED_ARCH</key>
+        <string></string>
         <key>NAME</key>
         <string>GNS3</string>
         <key>pkginfo</key>
@@ -32,7 +33,7 @@ See: https://gns3.com/community/blog/gns3-2-2-48-released and https://github.com
             <string>%NAME%</string>
             <key>supported_architectures</key>
             <array>
-                <string>arm64</string>
+                <string>%SUPPORTED_ARCH%</string>
             </array>
             <key>unattended_install</key>
             <true/>