소스 검색

Revert back to working version

Dennis Juhler Aagaard 5 년 전
부모
커밋
59eda4911e
4개의 변경된 파일52개의 추가작업 그리고 8개의 파일을 삭제
  1. 18 3
      OnlyOffice/ONLYOFFICE.download.recipe
  2. 13 2
      OnlyOffice/ONLYOFFICE.install.recipe
  3. 13 2
      OnlyOffice/ONLYOFFICE.munki.recipe
  4. 8 1
      OnlyOffice/ONLYOFFICE.pkg.recipe

+ 18 - 3
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>

+ 13 - 2
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>

+ 13 - 2
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>

+ 8 - 1
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>