From 1b4615440c2a16e1a910db760295bfdacb23bb63 Mon Sep 17 00:00:00 2001
From: Dennis Juhler Aagaard <aagaard@solutiogruppen.dk>
Date: Tue, 22 Aug 2023 09:55:36 +0200
Subject: [PATCH] Changed to official release channel

---
 Nextcloud/Nextcloud.download.recipe | 67 +++++++++++++++++++++++++++--
 Nextcloud/Nextcloud.install.recipe  | 26 +++++++++--
 Nextcloud/Nextcloud.munki.recipe    | 15 ++++++-
 3 files changed, 99 insertions(+), 9 deletions(-)

diff --git a/Nextcloud/Nextcloud.download.recipe b/Nextcloud/Nextcloud.download.recipe
index 3d5c9fa..a42c091 100644
--- a/Nextcloud/Nextcloud.download.recipe
+++ b/Nextcloud/Nextcloud.download.recipe
@@ -17,13 +17,22 @@
 	<string>1.0.0</string>
 	<key>Process</key>
 	<array>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>asset_regex</key>
+				<string>.*\.tgz$</string>
+				<key>github_repo</key>
+				<string>nextcloud-releases/desktop</string>
+			</dict>
+			<key>Processor</key>
+			<string>GitHubReleasesInfoProvider</string>
+		</dict>
 		<dict>
 			<key>Arguments</key>
 			<dict>
 				<key>filename</key>
-				<string>%NAME%.pkg</string>
-				<key>url</key>
-				<string>https://gogs.kulmosen.dk/attachments/052f39ce-7958-4104-a652-513c51bbe97b</string>
+				<string>%NAME%-%version%.tgz</string>
 			</dict>
 			<key>Processor</key>
 			<string>URLDownloader</string>
@@ -32,6 +41,19 @@
 			<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>
@@ -42,11 +64,48 @@
 					<string>Apple Root CA</string>
 				</array>
 				<key>input_path</key>
-				<string>%pathname%</string>
+				<string>%RECIPE_CACHE_DIR%/%NAME%/var/folders/yr/9dx0mtfj7kdf4725tmcz6md80000gp/T/macos-17174-install/arm/Nextcloud-qt5.15.4-3.9.3.17174git.pkg</string>
 			</dict>
 			<key>Processor</key>
 			<string>CodeSignatureVerifier</string>
 		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>destination_path</key>
+				<string>%RECIPE_CACHE_DIR%/unpack</string>
+				<key>flat_pkg_path</key>
+				<string>%RECIPE_CACHE_DIR%/%NAME%/var/folders/yr/9dx0mtfj7kdf4725tmcz6md80000gp/T/macos-17174-install/arm/Nextcloud-qt5.15.4-3.9.3.17174git.pkg</string>
+				<key>purge_destination</key>
+				<true/>
+			</dict>
+			<key>Processor</key>
+			<string>FlatPkgUnpacker</string>
+		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>destination_path</key>
+				<string>%RECIPE_CACHE_DIR%/payload</string>
+				<key>pkg_payload_path</key>
+				<string>%RECIPE_CACHE_DIR%/unpack/Nextcloud.pkg/Payload</string>
+				<key>purge_destination</key>
+				<true/>
+			</dict>
+			<key>Processor</key>
+			<string>PkgPayloadUnpacker</string>
+		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>input_plist_path</key>
+				<string>%RECIPE_CACHE_DIR%/payload/Applications/Nextcloud.app/Contents/Info.plist</string>
+				<key>plist_version_key</key>
+				<string>CFBundleShortVersionString</string>
+			</dict>
+			<key>Processor</key>
+			<string>Versioner</string>
+		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/Nextcloud/Nextcloud.install.recipe b/Nextcloud/Nextcloud.install.recipe
index 8402c6f..bde1c7b 100644
--- a/Nextcloud/Nextcloud.install.recipe
+++ b/Nextcloud/Nextcloud.install.recipe
@@ -22,11 +22,31 @@
 		<dict>
 			<key>Arguments</key>
 			<dict>
-				<key>pkg_path</key>
-				<string>%pathname%</string>
+				<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>Installer</string>
+			<string>DmgCreator</string>
+		</dict>
+		<dict>
+			<key>Arguments</key>
+			<dict>
+				<key>dmg_path</key>
+				<string>%dmg_path%</string>
+				<key>items_to_copy</key>
+				<array>
+					<dict>
+						<key>destination_path</key>
+						<string>/Applications</string>
+						<key>source_item</key>
+						<string>var/folders/yr/9dx0mtfj7kdf4725tmcz6md80000gp/T/macos-17174-install/arm/Nextcloud.app</string>
+					</dict>
+				</array>
+			</dict>
+			<key>Processor</key>
+			<string>InstallFromDMG</string>
 		</dict>
 	</array>
 </dict>
diff --git a/Nextcloud/Nextcloud.munki.recipe b/Nextcloud/Nextcloud.munki.recipe
index d05822d..6d98984 100644
--- a/Nextcloud/Nextcloud.munki.recipe
+++ b/Nextcloud/Nextcloud.munki.recipe
@@ -25,7 +25,7 @@
 				<string>testing</string>
 			</array>
 			<key>description</key>
-			<string> </string>
+			<string>💻 Desktop sync client for Nextcloud</string>
 			<key>developer</key>
 			<string>Nextcloud GmbH</string>
 			<key>display_name</key>
@@ -42,11 +42,22 @@
 	<string>com.github.solutiogruppen.download.Nextcloud</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>