From 9caa4ef8d42b292de0be9d3735e5e4a7987b8b95 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 21:47:03 +0000 Subject: [PATCH 1/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 79cb1ab..5d001a5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,7 +123,7 @@ 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 # If sandboxdomain doesn't exist, create it - if [ -n "$sandboxdomain" ]; then + if yunohost domain list --output-as json | jq .domains[] | tr -d '"' | grep -qw "^$sandboxdomain$"; then yunohost domain add $sandboxdomain yunohost domain config set $sandboxdomain -a "mail_in=0&mail_out=0" fi From a48d11475f2d8af9b2d51b413bf214c4c3d0c091 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 22:20:08 +0000 Subject: [PATCH 2/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 5d001a5..ca8a771 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,7 +123,7 @@ 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 # If sandboxdomain doesn't exist, create it - if yunohost domain list --output-as json | jq .domains[] | tr -d '"' | grep -qw "^$sandboxdomain$"; then + if yunohost domain list --output-as json | jq .domains[] | tr -d '"' | grep "$sandboxdomain" != $sandboxdomain; then yunohost domain add $sandboxdomain yunohost domain config set $sandboxdomain -a "mail_in=0&mail_out=0" fi From 4d96a4c5f475478fe8acd2fa5df21c8fd36440f5 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 22:28:17 +0000 Subject: [PATCH 3/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index ca8a771..24863c4 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,7 +123,7 @@ 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 # If sandboxdomain doesn't exist, create it - if yunohost domain list --output-as json | jq .domains[] | tr -d '"' | grep "$sandboxdomain" != $sandboxdomain; then + if yunohost domain list --output-as json | jq .domains[] | tr -d '"' | grep "$sandboxdomain" != "$sandboxdomain"; then yunohost domain add $sandboxdomain yunohost domain config set $sandboxdomain -a "mail_in=0&mail_out=0" fi From 4c63efd4bd82f90f895dcc3793aa500d293f89f5 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 22:45:45 +0000 Subject: [PATCH 4/7] Update upgrade --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 24863c4..098805d 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,7 +123,7 @@ 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 # If sandboxdomain doesn't exist, create it - if yunohost domain list --output-as json | jq .domains[] | tr -d '"' | grep "$sandboxdomain" != "$sandboxdomain"; then + if yunohost domain list --output-as json | jq .domains[] | tr -d '"' | grep -q "$sandboxdomain" != "$sandboxdomain"; then yunohost domain add $sandboxdomain yunohost domain config set $sandboxdomain -a "mail_in=0&mail_out=0" fi From ec8cf1da126d0af9b8373bb5a1f4b1240fafbf65 Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Fri, 3 Mar 2023 23:08:21 +0000 Subject: [PATCH 5/7] Update manifest.json --- manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.json b/manifest.json index 78e79ec..8128f96 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~ynh5", + "version": "5.2.1~ynh6", "url": "https://cryptpad.fr/", "upstream": { "license": "AGPL-3.0-only", From 2f1266ffa88786cfb60d255a9b53aa9e73fadf68 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 3 Mar 2023 23:08:24 +0000 Subject: [PATCH 6/7] 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 0ccbd35..a482755 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~ynh5 +**Shipped version:** 5.2.1~ynh6 **Demo:** https://cryptpad.fr/ diff --git a/README_fr.md b/README_fr.md index 9feb0e2..648affb 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~ynh5 +**Version incluse :** 5.2.1~ynh6 **Démo :** https://cryptpad.fr/ From fea5f7968340e5d0dd5eb92d4002193c906eccbf Mon Sep 17 00:00:00 2001 From: DDATAA <45762540+Ddataa@users.noreply.github.com> Date: Sat, 4 Mar 2023 19:57:24 +0000 Subject: [PATCH 7/7] Update scripts/upgrade Co-authored-by: Alexandre Aubin --- scripts/upgrade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/upgrade b/scripts/upgrade index 098805d..a48e2fc 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -123,7 +123,7 @@ 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 # If sandboxdomain doesn't exist, create it - if yunohost domain list --output-as json | jq .domains[] | tr -d '"' | grep -q "$sandboxdomain" != "$sandboxdomain"; then + if ! yunohost domain list --output-as json | jq -r .domains[] | grep -q "^$sandboxdomain\$"; then yunohost domain add $sandboxdomain yunohost domain config set $sandboxdomain -a "mail_in=0&mail_out=0" fi