From 59eda4911e00ae5f17d205a2b1035c1c4e5c61e0 Mon Sep 17 00:00:00 2001
From: Dennis Juhler Aagaard <aagaard@solutiogruppen.dk>
Date: Mon, 19 Oct 2020 11:48:31 +0200
Subject: [PATCH] Revert back to working version

---
 OnlyOffice/ONLYOFFICE.download.recipe | 21 ++++++++++++++++++---
 OnlyOffice/ONLYOFFICE.install.recipe  | 15 +++++++++++++--
 OnlyOffice/ONLYOFFICE.munki.recipe    | 15 +++++++++++++--
 OnlyOffice/ONLYOFFICE.pkg.recipe      |  9 ++++++++-
 4 files changed, 52 insertions(+), 8 deletions(-)

diff --git a/OnlyOffice/ONLYOFFICE.download.recipe b/OnlyOffice/ONLYOFFICE.download.recipe
index 0f89339..7d4d797 100644
--- a/OnlyOffice/ONLYOFFICE.download.recipe
+++ b/OnlyOffice/ONLYOFFICE.download.recipe
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>Comment</key>
-	<string>Created with Recipe Robot v2.0.0 (https://github.com/homebysix/recipe-robot)</string>
+	<string>Created with Recipe Robot v1.2.1 (https://github.com/homebysix/recipe-robot)</string>
 	<key>Description</key>
 	<string>Downloads the latest version of ONLYOFFICE.</string>
 	<key>Identifier</key>
@@ -12,6 +12,8 @@
 	<dict>
 		<key>NAME</key>
 		<string>ONLYOFFICE</string>
+		<key>SPARKLE_FEED_URL</key>
+		<string>http://download.onlyoffice.com/install/desktop/editors/mac/onlyoffice.xml</string>
 	</dict>
 	<key>MinimumVersion</key>
 	<string>1.0.0</string>
@@ -21,7 +23,7 @@
 			<key>Arguments</key>
 			<dict>
 				<key>appcast_url</key>
-				<string>http://download.onlyoffice.com/install/desktop/editors/mac/onlyoffice.xml</string>
+				<string>%SPARKLE_FEED_URL%</string>
 			</dict>
 			<key>Processor</key>
 			<string>SparkleUpdateInfoProvider</string>
@@ -39,11 +41,24 @@
 			<key>Processor</key>
 			<string>EndOfCheckPhase</string>
 		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>archive_path</key>
+				<string>%pathname%</string>
+				<key>destination_path</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%</string>
+				<key>purge_destination</key>
+				<true/>
+			</dict>
+			<key>Processor</key>
+			<string>Unarchiver</string>
+		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
 				<key>input_path</key>
-				<string>%pathname%/ONLYOFFICE.app</string>
+				<string>%RECIPE_CACHE_DIR%/%NAME%/ONLYOFFICE.app</string>
 				<key>requirement</key>
 				<string>anchor apple generic and identifier "asc.onlyoffice.ONLYOFFICE" and (certificate leaf[field.1.2.840.113635.100.6.1.9] /* exists */ or certificate 1[field.1.2.840.113635.100.6.2.6] /* exists */ and certificate leaf[field.1.2.840.113635.100.6.1.13] /* exists */ and certificate leaf[subject.OU] = "2WH24U26GJ")</string>
 			</dict>
diff --git a/OnlyOffice/ONLYOFFICE.install.recipe b/OnlyOffice/ONLYOFFICE.install.recipe
index b4db291..1e1cb69 100644
--- a/OnlyOffice/ONLYOFFICE.install.recipe
+++ b/OnlyOffice/ONLYOFFICE.install.recipe
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>Comment</key>
-	<string>Created with Recipe Robot v2.0.0 (https://github.com/homebysix/recipe-robot)</string>
+	<string>Created with Recipe Robot v1.2.1 (https://github.com/homebysix/recipe-robot)</string>
 	<key>Description</key>
 	<string>Installs the latest version of ONLYOFFICE.</string>
 	<key>Identifier</key>
@@ -23,7 +23,18 @@
 			<key>Arguments</key>
 			<dict>
 				<key>dmg_path</key>
-				<string>%pathname%</string>
+				<string>%RECIPE_CACHE_DIR%/%NAME%.dmg</string>
+				<key>dmg_root</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%</string>
+			</dict>
+			<key>Processor</key>
+			<string>DmgCreator</string>
+		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>dmg_path</key>
+				<string>%dmg_path%</string>
 				<key>items_to_copy</key>
 				<array>
 					<dict>
diff --git a/OnlyOffice/ONLYOFFICE.munki.recipe b/OnlyOffice/ONLYOFFICE.munki.recipe
index c18b847..813ce16 100644
--- a/OnlyOffice/ONLYOFFICE.munki.recipe
+++ b/OnlyOffice/ONLYOFFICE.munki.recipe
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>Comment</key>
-	<string>Created with Recipe Robot v2.0.0 (https://github.com/homebysix/recipe-robot)</string>
+	<string>Created with Recipe Robot v1.2.1 (https://github.com/homebysix/recipe-robot)</string>
 	<key>Description</key>
 	<string>Downloads the latest version of ONLYOFFICE and imports it into Munki.</string>
 	<key>Identifier</key>
@@ -38,11 +38,22 @@
 	<string>com.github.solutiogruppen.download.ONLYOFFICE</string>
 	<key>Process</key>
 	<array>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>dmg_path</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%.dmg</string>
+				<key>dmg_root</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%</string>
+			</dict>
+			<key>Processor</key>
+			<string>DmgCreator</string>
+		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
 				<key>pkg_path</key>
-				<string>%pathname%</string>
+				<string>%dmg_path%</string>
 				<key>repo_subdirectory</key>
 				<string>%MUNKI_REPO_SUBDIR%</string>
 			</dict>
diff --git a/OnlyOffice/ONLYOFFICE.pkg.recipe b/OnlyOffice/ONLYOFFICE.pkg.recipe
index e89eea6..944549a 100644
--- a/OnlyOffice/ONLYOFFICE.pkg.recipe
+++ b/OnlyOffice/ONLYOFFICE.pkg.recipe
@@ -3,13 +3,15 @@
 <plist version="1.0">
 <dict>
 	<key>Comment</key>
-	<string>Created with Recipe Robot v2.0.0 (https://github.com/homebysix/recipe-robot)</string>
+	<string>Created with Recipe Robot v1.2.1 (https://github.com/homebysix/recipe-robot)</string>
 	<key>Description</key>
 	<string>Downloads the latest version of ONLYOFFICE and creates a package.</string>
 	<key>Identifier</key>
 	<string>com.github.solutiogruppen.pkg.ONLYOFFICE</string>
 	<key>Input</key>
 	<dict>
+		<key>BUNDLE_ID</key>
+		<string>asc.onlyoffice.ONLYOFFICE</string>
 		<key>NAME</key>
 		<string>ONLYOFFICE</string>
 	</dict>
@@ -20,6 +22,11 @@
 	<key>Process</key>
 	<array>
 		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>app_path</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%/ONLYOFFICE.app</string>
+			</dict>
 			<key>Processor</key>
 			<string>AppPkgCreator</string>
 		</dict>