Skip to content

Commit 092be1c

Browse files
mgallienmgallien
authored
Merge pull request #176 from nextcloud/bugfix/sparkle-2-support
Add Sparkle 2 required sparkle:installationType to response Sparkle enclosure
2 parents a1c088c + 38a9a8d commit 092be1c

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

‎src/Response.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ private function buildSparkleResponse(array $updateVersion) : string {
223223
<item>
224224
<title>'.$versionString.'</title>
225225
<pubDate>'.$this->getCurrentTimeStamp().'</pubDate>
226-
<enclosure url="'.$sparkleUrl.'" sparkle:version="'.$updateVersion['version'].'" type="application/octet-stream" sparkle:edSignature="'.$sparkleSignature.'" length="'.$sparkleLength.'"/>
226+
<enclosure url="'.$sparkleUrl.'" sparkle:version="'.$updateVersion['version'].'" type="application/octet-stream" sparkle:installationType="package" sparkle:edSignature="'.$sparkleSignature.'" length="'.$sparkleLength.'"/>
227227
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
228228
</item>' : '';
229229

‎tests/unit/ResponseTest.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ public function updateDataProvider(): array
231231
<item>
232232
<title>Nextcloud Client 2.2.2 (build 3472)</title>
233233
<pubDate>Wed, 13 July 16 21:07:31 +0200</pubDate>
234-
<enclosure url="https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg.tbz" sparkle:version="2.2.2.3472" type="application/octet-stream" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
234+
<enclosure url="https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg.tbz" sparkle:version="2.2.2.3472" type="application/octet-stream" sparkle:installationType="package" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
235235
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
236236
</item>
237237
</channel>
@@ -402,7 +402,7 @@ public function updateDataProvider(): array
402402
<item>
403403
<title>Nextcloud Client 2.2.2 (build 3472)</title>
404404
<pubDate>Wed, 13 July 16 21:07:31 +0200</pubDate>
405-
<enclosure url="https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg.tbz" sparkle:version="2.2.2.3472" type="application/octet-stream" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
405+
<enclosure url="https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg.tbz" sparkle:version="2.2.2.3472" type="application/octet-stream" sparkle:installationType="package" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
406406
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
407407
</item>
408408
</channel>
@@ -493,7 +493,7 @@ public function updateDataProvider(): array
493493
<item>
494494
<title>Nextcloud Client 2.2.2 (build 3472)</title>
495495
<pubDate>Wed, 13 July 16 21:07:31 +0200</pubDate>
496-
<enclosure url="https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg.tbz" sparkle:version="2.2.2.3472" type="application/octet-stream" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
496+
<enclosure url="https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg.tbz" sparkle:version="2.2.2.3472" type="application/octet-stream" sparkle:installationType="package" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
497497
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
498498
</item>
499499
</channel>
@@ -520,7 +520,7 @@ public function updateDataProvider(): array
520520
<item>
521521
<title>Nextcloud Client 2.2.2-rc2</title>
522522
<pubDate>Wed, 13 July 16 21:07:31 +0200</pubDate>
523-
<enclosure url="https://download.nextcloud.com/desktop/stable/Nextcloud-2.2.2-rc1.pkg.tbz" sparkle:version="2.2.2-rc2" type="application/octet-stream" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
523+
<enclosure url="https://download.nextcloud.com/desktop/stable/Nextcloud-2.2.2-rc1.pkg.tbz" sparkle:version="2.2.2-rc2" type="application/octet-stream" sparkle:installationType="package" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
524524
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
525525
</item>
526526
</channel>
@@ -547,7 +547,7 @@ public function updateDataProvider(): array
547547
<item>
548548
<title>Nextcloud Client 2.2.2-rc2</title>
549549
<pubDate>Wed, 13 July 16 21:07:31 +0200</pubDate>
550-
<enclosure url="https://download.nextcloud.com/desktop/stable/Nextcloud-2.2.2-rc1.pkg.tbz" sparkle:version="2.2.2-rc2" type="application/octet-stream" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
550+
<enclosure url="https://download.nextcloud.com/desktop/stable/Nextcloud-2.2.2-rc1.pkg.tbz" sparkle:version="2.2.2-rc2" type="application/octet-stream" sparkle:installationType="package" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
551551
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
552552
</item>
553553
</channel>
@@ -670,7 +670,7 @@ public function updateDataProvider(): array
670670
<item>
671671
<title>Nextcloud Client 2.0.0 (build 0000)</title>
672672
<pubDate>Wed, 13 July 16 21:07:31 +0200</pubDate>
673-
<enclosure url="https://download.nextcloud.com/desktop/stable/Nextcloud-2.0.0.0000.pkg.tbz" sparkle:version="2.0.0.0000" type="application/octet-stream" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
673+
<enclosure url="https://download.nextcloud.com/desktop/stable/Nextcloud-2.0.0.0000.pkg.tbz" sparkle:version="2.0.0.0000" type="application/octet-stream" sparkle:installationType="package" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
674674
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
675675
</item>
676676
</channel>
@@ -841,7 +841,7 @@ public function updateDataProvider(): array
841841
<item>
842842
<title>Nextcloud Client 2.2.2 (build 3472)</title>
843843
<pubDate>Wed, 13 July 16 21:07:31 +0200</pubDate>
844-
<enclosure url="https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg.tbz" sparkle:version="2.2.2.3472" type="application/octet-stream" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
844+
<enclosure url="https://download.owncloud.com/desktop/stable/ownCloud-2.2.2.3472.pkg.tbz" sparkle:version="2.2.2.3472" type="application/octet-stream" sparkle:installationType="package" sparkle:edSignature="MC0CFQDmXR6biDmNVW7TvMh0bfPPTzCvtwIUCzASgpzYdi4lltOnwbFCeQwgDjY=" length="62738920"/>
845845
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
846846
</item>
847847
</channel>

0 commit comments

Comments
 (0)