don't include 'installs' key for GPGMailLoader.mailbundle

dhmoore · Oct 24, 2018 · 44bcc41 · 44bcc41
1 parent 4459605
commit 44bcc41
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 29 deletions.
diff --git a/GPGTools/GPGSuite.munki.recipe b/GPGTools/GPGSuite.munki.recipe
@@ -14,8 +14,6 @@
             <string>Utilities</string>
             <key>NAME</key>
             <string>GPGSuite</string>
-            <key>OS_VERSION</key>
-		    <string>10.13</string>
             <key>pkginfo</key>
             <dict>
                 <key>catalogs</key>
@@ -33,9 +31,7 @@
                 <key>name</key>
                 <string>%NAME%</string>
 			    <key>minimum_os_version</key>
-			    <string>%OS_VERSION%.0</string>
-			    <key>maximum_os_version</key>
-			    <string>%OS_VERSION%.99</string>
+			    <string>10.12</string>
                 <key>blocking_applications</key>
                 <array>
                     <string>Mail</string>
@@ -87,28 +83,6 @@
                 <key>Processor</key>
                 <string>Copier</string>
             </dict>
-            <dict>
-                <key>Arguments</key>
-                <dict>
-                    <key>pkg_payload_path</key>
-                    <string>%RECIPE_CACHE_DIR%/unpack/GPGMailLoader_Core.pkg/Payload</string>
-                    <key>destination_path</key>
-                    <string>%RECIPE_CACHE_DIR%/unpack</string>
-                </dict>
-                <key>Processor</key>
-                <string>PkgPayloadUnpacker</string>
-            </dict>
-            <dict>
-                <key>Arguments</key>
-                <dict>
-                    <key>destination_path</key>
-                    <string>%RECIPE_CACHE_DIR%/unpack/Library/Mail/Bundles</string>
-                    <key>source_path</key>
-                    <string>%RECIPE_CACHE_DIR%/unpack/private/tmp/org.gpgtools/gpgmailloader_install</string>
-                </dict>
-                <key>Processor</key>
-                <string>Copier</string>
-            </dict>
             <dict>
                 <key>Arguments</key>
                 <dict>
@@ -117,7 +91,6 @@
                     <key>installs_item_paths</key>
                     <array>
                         <string>/Library/Application Support/GPGTools/GPGSuite_Updater.app</string>
-                        <string>/Library/Mail/Bundles/GPGMailLoader.mailbundle</string>
                     </array>
                     <key>version_comparison_key</key>
                     <string>CFBundleVersion</string>

diff --git a/GPGTools/GPGSuiteUniversal.munki.recipe b/GPGTools/GPGSuiteUniversal.munki.recipe
@@ -31,7 +31,7 @@
                 <key>name</key>
                 <string>%NAME%</string>
 			    <key>minimum_os_version</key>
-			    <string>10.9</string>
+			    <string>10.12</string>
                 <key>blocking_applications</key>
                 <array>
                     <string>Mail</string>