From d2f743a6d2117c30ae26350e64319b08cd33d086 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Fri, 9 Jul 2021 19:27:10 +0200 Subject: [PATCH 1/6] Upgrade to 22.0.0 --- manifest.json | 4 ++-- scripts/upgrade.d/upgrade.21.sh | 7 +++++++ scripts/upgrade.d/upgrade.last.sh | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 scripts/upgrade.d/upgrade.21.sh diff --git a/manifest.json b/manifest.json index 2d7a9d7..4e309c1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,13 +6,13 @@ "en": "Online storage, file sharing platform and various other applications", "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" }, - "version": "21.0.3~ynh1", + "version": "22.0.0~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", "website": "https://nextcloud.com", "demo": "https://demo.nextcloud.com/", - "admindoc": "https://docs.nextcloud.com/server/21/user_manual/en/", + "admindoc": "https://docs.nextcloud.com/server/22/user_manual/en/", "userdoc": "https://yunohost.org/en/app_nextcloud", "code": "https://github.com/nextcloud/server" }, diff --git a/scripts/upgrade.d/upgrade.21.sh b/scripts/upgrade.d/upgrade.21.sh new file mode 100644 index 0000000..f617405 --- /dev/null +++ b/scripts/upgrade.d/upgrade.21.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +# Last available nextcloud version +next_version="22.0.0" + +# Nextcloud tarball checksum sha256 +nextcloud_source_sha256="3911d3754c37aca7c9b5f3b2b37513c0f2b5bb979af00816c1117b1eedbc5d7a" diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 72dca50..1c6ff92 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="21.0.3" +next_version="22.0.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="8adcd175c7a70c33332586fa9ce36d03ba02d1df5d4c334d1210201d3fb953ee" +nextcloud_source_sha256="3911d3754c37aca7c9b5f3b2b37513c0f2b5bb979af00816c1117b1eedbc5d7a" From f745c5c6ed26fc2e0c5f46cc828960b3ab0ef9e8 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Aug 2021 11:53:02 +0200 Subject: [PATCH 2/6] 22.1.0 --- manifest.json | 4 ++-- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifest.json b/manifest.json index 4e309c1..f96721e 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online storage, file sharing platform and various other applications", "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" }, - "version": "22.0.0~ynh1", + "version": "22.1.0~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", @@ -22,7 +22,7 @@ "email": "pierre@kayou.io" }, "requirements": { - "yunohost": ">= 4.2" + "yunohost": ">= 4.2.0" }, "multi_instance": true, "services": [ diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 1c6ff92..0b7b9d2 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="22.0.0" +next_version="22.1.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="3911d3754c37aca7c9b5f3b2b37513c0f2b5bb979af00816c1117b1eedbc5d7a" +nextcloud_source_sha256="cbe1ebd3133e2efa6d5b9c0d0f34dc50c1ec45fe042ca06d034cbf15f888dd25" From 23316152ff3f30f0708798009f1f4932a0f38377 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 5 Aug 2021 13:19:07 +0200 Subject: [PATCH 3/6] Update upgrade.last.sh --- scripts/upgrade.d/upgrade.last.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 0b7b9d2..14c8c6b 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -4,4 +4,4 @@ next_version="22.1.0" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="cbe1ebd3133e2efa6d5b9c0d0f34dc50c1ec45fe042ca06d034cbf15f888dd25" +nextcloud_source_sha256="4820808f799146853604e1fa27d7f292449018a44dc73bf928a97b02028318ba" From e0e8978e54786535af7c44e4ca5d59c748251190 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Mon, 9 Aug 2021 14:05:36 +0200 Subject: [PATCH 4/6] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index f96721e..5bceb81 100644 --- a/manifest.json +++ b/manifest.json @@ -12,8 +12,8 @@ "license": "AGPL-3.0", "website": "https://nextcloud.com", "demo": "https://demo.nextcloud.com/", - "admindoc": "https://docs.nextcloud.com/server/22/user_manual/en/", - "userdoc": "https://yunohost.org/en/app_nextcloud", + "admindoc": "https://docs.nextcloud.com/server/stable/admin_manual/", + "userdoc": "https://docs.nextcloud.com/server/latest/user_manual/en/", "code": "https://github.com/nextcloud/server" }, "license": "AGPL-3.0", From 3dfeef1b7f3cbeef29850886b8defc404175c793 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Thu, 26 Aug 2021 19:56:41 +0200 Subject: [PATCH 5/6] 22.1.1 --- manifest.json | 2 +- scripts/upgrade.d/upgrade.last.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.json b/manifest.json index 5bceb81..fc8be17 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Online storage, file sharing platform and various other applications", "fr": "Stockage en ligne, plateforme de partage de fichiers et diverses autres applications" }, - "version": "22.1.0~ynh1", + "version": "22.1.1~ynh1", "url": "https://nextcloud.com", "upstream": { "license": "AGPL-3.0", diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh index 14c8c6b..607191e 100755 --- a/scripts/upgrade.d/upgrade.last.sh +++ b/scripts/upgrade.d/upgrade.last.sh @@ -1,7 +1,7 @@ #!/bin/bash # Last available Nextcloud version -next_version="22.1.0" +next_version="22.1.1" # Nextcloud tarball checksum sha256 -nextcloud_source_sha256="4820808f799146853604e1fa27d7f292449018a44dc73bf928a97b02028318ba" +nextcloud_source_sha256="e55b6eb977fb539081e33a7d8f196e38430eb337cc76bf0379a663a497fbde5b" From 7e8b0c9d7fba701f904573f924c1a7f7e2f10463 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Wed, 8 Sep 2021 07:33:51 +0200 Subject: [PATCH 6/6] Update restore --- scripts/restore | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/restore b/scripts/restore index 2888599..0449f5b 100755 --- a/scripts/restore +++ b/scripts/restore @@ -37,8 +37,6 @@ fpm_usage=$(ynh_app_setting_get --app=$app --key=fpm_usage) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=4 -ynh_webpath_available --domain=$domain --path_url=$path_url \ - || ynh_die --message="Path not available: ${domain}${path_url}" test ! -d $final_path \ || ynh_die --message="There is already a directory: $final_path "