Merge pull request #287 from paul-cossey/master

Update CitrixWorkspace.munki.recipe

Author: hjuutilainen

CitrixReceiver/CitrixWorkspace.munki.recipe

@@ -3,11 +3,15 @@
 <plist version="1.0">
 <dict>
 	<key>Description</key>
-	<string>Downloads the current release version of Citrix Workspace and imports into Munki.</string>
+	<string>Downloads the current release version of Citrix Workspace and imports into Munki.
+
+Set the DERIVE_MIN_OS variable to a non-empty string to set the minimum_os_version via MunkiInstallsItemsCreator. This requires a minimum AutoPkg version of 2.7 please update if you're not already running it.</string>
 	<key>Identifier</key>
 	<string>io.github.hjuutilainen.munki.CitrixWorkspace</string>
 	<key>Input</key>
 	<dict>
+		<key>DERIVE_MIN_OS</key>
+		<string>YES</string>
 		<key>NAME</key>
 		<string>CitrixWorkspace</string>
 		<key>MUNKI_REPO_SUBDIR</key>
@@ -41,7 +45,7 @@
 		</dict>
 	</dict>
 	<key>MinimumVersion</key>
-	<string>0.2.0</string>
+	<string>2.7</string>
 	<key>ParentRecipe</key>
 	<string>io.github.hjuutilainen.download.CitrixWorkspace</string>
 	<key>Process</key>
@@ -68,37 +72,39 @@
 			<key>Processor</key>
 			<string>PkgPayloadUnpacker</string>
 		</dict>
-        <dict>
-           <key>Arguments</key>
-           <dict>
-              <key>flat_pkg_path</key>
-              <string>%RECIPE_CACHE_DIR%/payload/Library/Application Support/CitrixPackage/com.citrix.apps.cwa.pkg</string>
-              <key>destination_path</key>
-              <string>%RECIPE_CACHE_DIR%/payload2</string>
-           </dict>
-           <key>Processor</key>
-           <string>FlatPkgUnpacker</string>
-        </dict>
-        <dict>
-           <key>Arguments</key>
-           <dict>
-              <key>pkg_payload_path</key>
-              <string>%RECIPE_CACHE_DIR%/payload2/com.citrix.ICAClientcwa.pkg/Payload</string>
-              <key>destination_path</key>
-              <string>%RECIPE_CACHE_DIR%/payload3</string>
-           </dict>
-           <key>Processor</key>
-           <string>PkgPayloadUnpacker</string>
-        </dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>flat_pkg_path</key>
+				<string>%RECIPE_CACHE_DIR%/payload/Library/Application Support/CitrixPackage/com.citrix.apps.cwa.pkg</string>
+				<key>destination_path</key>
+				<string>%RECIPE_CACHE_DIR%/payload2</string>
+			</dict>
+			<key>Processor</key>
+			<string>FlatPkgUnpacker</string>
+		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>pkg_payload_path</key>
+				<string>%RECIPE_CACHE_DIR%/payload2/com.citrix.ICAClientcwa.pkg/Payload</string>
+				<key>destination_path</key>
+				<string>%RECIPE_CACHE_DIR%/payload3</string>
+			</dict>
+			<key>Processor</key>
+			<string>PkgPayloadUnpacker</string>
+		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
 				<key>faux_root</key>
-				<string>%RECIPE_CACHE_DIR%/payload</string>
+				<string>%RECIPE_CACHE_DIR%/payload3</string>
 				<key>installs_item_paths</key>
 				<array>
 					<string>/Applications/Citrix Workspace.app</string>
 				</array>
+				<key>derive_minimum_os_version</key>
+				<string>%DERIVE_MIN_OS%</string>
 			</dict>
 			<key>Processor</key>
 			<string>MunkiInstallsItemsCreator</string>
@@ -110,45 +116,17 @@
 			<string>MunkiPkginfoMerger</string>
 		</dict>
 		<dict>
-			<key>Arguments</key>
-			<dict>
-				<key>info_path</key>
-				<string>%RECIPE_CACHE_DIR%/payload3/Applications/Citrix Workspace.app/Contents/Info.plist</string>
-				<key>plist_keys</key>
-				<dict>
-					<key>CFBundleShortVersionString</key>
-					<string>version</string>
-					<key>LSMinimumSystemVersion</key>
-					<string>minimum_os_version</string>
-				</dict>
-			</dict>
 			<key>Processor</key>
-			<string>PlistReader</string>
-		</dict>
-		<dict>
+			<string>MunkiImporter</string>
 			<key>Arguments</key>
 			<dict>
-				<key>additional_pkginfo</key>
-				<dict>
-                    <key>minimum_os_version</key>
-                    <string>%minimum_os_version%</string>
-                    <key>installs</key>
-                    <array>
-                       <dict>
-                          <key>CFBundleShortVersionString</key>
-                          <string>%version%</string>
-                          <key>path</key>
-                          <string>/Applications/Citrix Workspace.app</string>
-                          <key>type</key>
-                          <string>application</string>
-                          <key>version_comparison_key</key>
-                          <string>CFBundleShortVersionString</string>
-                       </dict>
-                    </array>
-				</dict>
+				<key>munkiimport_pkgname</key>
+				<string>Install Citrix Workspace.pkg</string>
+				<key>pkg_path</key>
+				<string>%pathname%</string>
+				<key>repo_subdirectory</key>
+				<string>%MUNKI_REPO_SUBDIR%</string>
 			</dict>
-			<key>Processor</key>
-			<string>MunkiPkginfoMerger</string>
 		</dict>
 		<dict>
 			<key>Arguments</key>
@@ -158,25 +136,12 @@
 					<string>%RECIPE_CACHE_DIR%/unpack</string>
 					<string>%RECIPE_CACHE_DIR%/payload</string>
 					<string>%RECIPE_CACHE_DIR%/payload2</string>
-					<string>%RECIPE_CACHE_DIR%/payload3</string>
+					<string>%RECIPE_CACHE_DIR%/payload3/</string>
 				</array>
 			</dict>
 			<key>Processor</key>
 			<string>PathDeleter</string>
 		</dict>
-		<dict>
-			<key>Processor</key>
-			<string>MunkiImporter</string>
-			<key>Arguments</key>
-			<dict>
-				<key>munkiimport_pkgname</key>
-				<string>Install Citrix Workspace.pkg</string>
-				<key>pkg_path</key>
-				<string>%pathname%</string>
-				<key>repo_subdirectory</key>
-				<string>%MUNKI_REPO_SUBDIR%</string>
-			</dict>
-		</dict>
 	</array>
 </dict>
 </plist>