From 711fe9cba0fec1c7c94513cac33d8ea8167b5d29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:30:34 +0100 Subject: [PATCH 1/4] typo --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 2d0e277..fa3f51c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -118,7 +118,7 @@ if [[ $domain == *".local" ]]; then sandboxdomain=sandbox-$domain fi -ynh_script_progression --message="Setting up sandobx domain : $sandboxdomain" --weight=1 +ynh_script_progression --message="Setting up sandobx domain: $sandboxdomain" --weight=1 # We don't test that in CI if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then From 00c6c6b61125d2c8c1bc6fb9d36e79848d859169 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Wed, 15 Feb 2023 21:57:05 +0000 Subject: [PATCH 2/4] Update upgrade --- scripts/upgrade | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index fa3f51c..39afa10 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,8 +122,11 @@ ynh_script_progression --message="Setting up sandobx domain: $sandboxdomain" --w # We don't test that in CI if ! [ ${PACKAGE_CHECK_EXEC:-0} -eq 1 ]; then - yunohost domain add $sandboxdomain - yunohost domain config set $sandboxdomain -a "mail_in=0&mail_out=0" + # If sandboxdomain doesn't exist, create it + if [ -z "$sandboxdomain" ]; then + yunohost domain add $sandboxdomain + yunohost domain config set $sandboxdomain -a "mail_in=0&mail_out=0" + fi fi #================================================= From 5fc683a0b4a6e50cf8356278ef0b5b44980253e6 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Wed, 15 Feb 2023 22:21:17 +0000 Subject: [PATCH 3/4] Update manifest.json --- manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.json b/manifest.json index e89e4e9..7d68ecc 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Zero Knowledge realtime collaborative office suite", "fr": "Suite bureautique chiffrée pour la collaboration en temps réel" }, - "version": "5.2.1~ynh2", + "version": "5.2.1~ynh4", "url": "https://cryptpad.fr/", "upstream": { "license": "AGPL-3.0-only", @@ -54,4 +54,4 @@ } ] } -} \ No newline at end of file +} From 2346588936b2a79e702b94ebcfa4717949121f0b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 15 Feb 2023 22:21:45 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a348290..3e2b8dc 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in CryptPad is a collaboration suite that is end-to-end-encrypted and open-source. It is built to enable collaboration, synchronizing changes to documents in real time. Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored. -**Shipped version:** 5.2.1~ynh2 +**Shipped version:** 5.2.1~ynh4 **Demo:** https://cryptpad.fr/ diff --git a/README_fr.md b/README_fr.md index ce6f8db..f8f6e45 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po CryptPad est une suite de collaboration chiffrée de bout en bout et open source. Il est conçu pour permettre la collaboration, en synchronisant les modifications apportées aux documents en temps réel. Étant donné que toutes les données sont chiffrées, le service et ses administrateurs n'ont aucun moyen de voir le contenu modifié et stocké. -**Version incluse :** 5.2.1~ynh2 +**Version incluse :** 5.2.1~ynh4 **Démo :** https://cryptpad.fr/