Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update to 3.13.1 latest desktop client release #148

Merged
merged 3 commits into from
Jul 3, 2024
Merged

update to 3.13.1 latest desktop client release #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
acd6166
update to 3.13.1 latest desktop client release
mgallien Jul 2, 2024
97b4fc2
file provider VFS macOS has its own version
mgallien Jul 3, 2024
16c1f7f
fix indentation
mgallien Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions config/config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@

declare(strict_types=1);

$stableReleaseDate = '2024-04-24 14:00';
$stableVersion = '3.13.0';
$stableReleaseDate = '2024-07-02 10:00';
$stableVersion = '3.13.1';
$fileProviderStableReleaseDate = '2024-04-24 14:00';
$fileProviderStableVersion = '3.13.0';

$betaReleaseDate = '2024-04-13 15:00';
$betaVersionInternal = '3.12.81';
Expand All @@ -34,6 +36,7 @@
$dailyUrl = "https://download.nextcloud.com/desktop/daily/";

$stableVersionString = 'Nextcloud Client ' . $stableVersion;
$fileProviderStableVersionString = 'Nextcloud Client ' . $fileProviderStableVersion;
$betaVersionString = 'Nextcloud Client ' . $betaVersion;

if (version_compare($version, '3.0.3') < 0) {
Expand Down Expand Up @@ -87,15 +90,16 @@
'macos' => [
'version' => $stableVersion,
'versionstring' => $stableVersionString,
"fileProviderVersionString" => $fileProviderStableVersionString,
'downloadurl' => $stable_mac_url . 'Nextcloud-' . $stableVersion . '.pkg',
'fileProviderDownloadUrl' => $stable_mac_url . 'Nextcloud-' . $stableVersion . '-macOS-vfs.pkg',
'fileProviderDownloadUrl' => $stable_mac_url . 'Nextcloud-' . $fileProviderStableVersion . '-macOS-vfs.pkg',
'web' => 'https://nextcloud.com/install',
"sparkleDownloadUrl" => $stable_mac_url . 'Nextcloud-' . $stableVersion . '.pkg.tbz',
"fileProviderSparkleDownloadUrl" => $stable_mac_url . 'Nextcloud-' . $stableVersion . '-macOS-vfs.pkg.tbz',
"signature" => "PiIm4QHCGj3cQcr4K4mX30qUl+NUwM0hvQmpu30UE7iagM4Tq3vPQRfFywwYHMurfSav6rpckhhbyNjmZoCqDA==",
"fileProviderSignature" => "mHJDtEbZDnWElr2MQa44kEHp6wOwbPae+CYyLZbueeFuT+K8Us3icimrcQ8uBU1vb0UNay5j6L+dVhf9VO8qBw==",
"length" => 64617546,
"fileProviderLength" => 97313419,
"fileProviderSparkleDownloadUrl" => $stable_mac_url . 'Nextcloud-' . $fileProviderStableVersion . '-macOS-vfs.pkg.tbz',
"signature" => "++voffbxHKaURwb+EAVtj5uvvCZTRKIY6LUMNQx1dt8lnJyxv2vlCmJxydfM/oOPLkYrE9PAhqTHFNmmX6QXCA==",
"fileProviderSignature" => "mHJDtEbZDnWElr2MQa44kEHp6wOwbPae+CYyLZbueeFuT+K8Us3icimrcQ8uBU1vb0UNay5j6L+dVhf9VO8qBw==",
"length" => 64626206,
"fileProviderLength" => 97313419,
],
],
'beta' => [
Expand All @@ -116,14 +120,14 @@
'version' => $betaVersionInternal,
'versionstring' => $betaVersionString,
'downloadurl' => $beta_mac_url . 'Nextcloud-' . $betaVersion . '.pkg',
// 'fileProviderDownloadUrl' => $beta_mac_url . 'Nextcloud-macOS-vfs-' . $betaVersion . '.pkg', TODO: 3.13.0
// 'fileProviderDownloadUrl' => $beta_mac_url . 'Nextcloud-macOS-vfs-' . $betaVersion . '.pkg', TODO: 3.13.0
'web' => 'https://nextcloud.com/install',
"sparkleDownloadUrl" => $beta_mac_url . 'Nextcloud-' . $betaVersion . '.pkg.tbz',
// "fileProviderSparkleDownloadUrl" => $beta_mac_url . 'Nextcloud-macOS-vfs-' . $betaVersion . '.pkg', TODO: 3.13.0
// "fileProviderSparkleDownloadUrl" => $beta_mac_url . 'Nextcloud-macOS-vfs-' . $betaVersion . '.pkg', TODO: 3.13.0
"signature" => "5wXe1phH6syvreaT+2Lah40CBzdyVnjzCWlmAjdwoKe/uSDlR+Hk5er+Y7nu/W2FDkeLvAxzNr2nK4HIhJZ+Cw==",
// "fileProviderSignature" => "5wXe1phH6syvreaT+2Lah40CBzdyVnjzCWlmAjdwoKe/uSDlR+Hk5er+Y7nu/W2FDkeLvAxzNr2nK4HIhJZ+Cw==", TODO: 3.13.0
// "fileProviderSignature" => "5wXe1phH6syvreaT+2Lah40CBzdyVnjzCWlmAjdwoKe/uSDlR+Hk5er+Y7nu/W2FDkeLvAxzNr2nK4HIhJZ+Cw==", TODO: 3.13.0
"length" => 64530955 //,
// "fileProviderLength" => 64530955 TODO: 3.13.0
// "fileProviderLength" => 64530955 TODO: 3.13.0
],
],
'daily' => [
Expand Down
8 changes: 7 additions & 1 deletion src/Response.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ private function getSparkleUpdateLength(array $updateVersion) : int {
return $updateVersion[$updateLengthKey];
}

private function getSparkleVersionString(array $updateVersion) : string {
$updateLengthKey = $this->isFileProvider ? 'fileProviderVersionString' : 'versionstring';
return $updateVersion[$updateLengthKey];
}

/**
* Builds the response for Sparkle (used by the Mac updater)
*
Expand All @@ -139,12 +144,13 @@ private function getSparkleUpdateLength(array $updateVersion) : int {
*/
private function buildSparkleResponse(array $updateVersion) : string {
$sparkleUrl = $this->getSparkleUpdateUrl($updateVersion);
$versionString = $this->getSparkleVersionString($updateVersion);
$sparkleSignature = $this->getSparkleUpdateSignature($updateVersion);
$sparkleLength = $this->getSparkleUpdateLength($updateVersion);

$item = !empty($updateVersion) ? '
<item>
<title>'.$updateVersion['versionstring'].'</title>
<title>'.$versionString.'</title>
<pubDate>'.$this->getCurrentTimeStamp().'</pubDate>
<enclosure url="'.$sparkleUrl.'" sparkle:version="'.$updateVersion['version'].'" type="application/octet-stream" sparkle:edSignature="'.$sparkleSignature.'" length="'.$sparkleLength.'"/>
<sparkle:minimumSystemVersion>11.0</sparkle:minimumSystemVersion>
Expand Down
Loading