From e414589ae0d0e0ccbc20e9363747d9b97f2f0f9d Mon Sep 17 00:00:00 2001
From: Fabian Wilkens <wilkens.fabian+github@gmail.com>
Date: Thu, 13 May 2021 11:56:26 +0200
Subject: [PATCH 1/2] Fix upgrade script

---
 scripts/upgrade | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 22e2204..8ac20f1 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -23,6 +23,8 @@ final_path=$(ynh_app_setting_get --app=$app --key=final_path)
 port=$(ynh_app_setting_get --app=$app --key=port)
 snserver_domain=$(ynh_app_setting_get --app=$app --key=snserver_domain)
 
+config_file="$final_path/live/.env"
+
 #=================================================
 # CHECK VERSION
 #=================================================
@@ -162,7 +164,6 @@ popd
 #=================================================
 # MODIFY A CONFIG FILE
 #=================================================
-config_file="$final_path/live/.env"
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
     ynh_script_progression --message="Modifying a config file..." --weight=2

From 35c6e06e4f65e229c90848c43708c4b192a0e7be Mon Sep 17 00:00:00 2001
From: Fabian Wilkens <wilkens.fabian+github@gmail.com>
Date: Thu, 13 May 2021 16:31:08 +0200
Subject: [PATCH 2/2] Fix upgrade script. -> Update to ~ynh2

---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 manifest.json   | 2 +-
 scripts/upgrade | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 8d12732..e3eaab3 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, Windows, Linux, iOS, and Android.
 
-**Shipped version:** 3.22.8~ynh2
+**Shipped version:** 3.6.8~ynh2
 
 **Demo:** https://standardnotes.org/demo
 
diff --git a/README_fr.md b/README_fr.md
index e9d7c34..cc18190 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -13,7 +13,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 
 
-**Version incluse:** 3.22.8~ynh2
+**Version incluse:** 3.6.8~ynh2
 
 **Démo:** https://standardnotes.org/demo
 
diff --git a/manifest.json b/manifest.json
index e8ecf45..95787d9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -5,7 +5,7 @@
     "description": {
         "en": "The Standard Notes Web App. An end-to-end encrypted note-taking app. Web, Mac, Windows, Linux, iOS, and Android."
     },
-    "version": "3.6.8~ynh1",
+    "version": "3.6.8~ynh2",
     "url": "https://github.com/standardnotes/web",
     "upstream": {
         "license": "AGPL-3.0-or-later",
diff --git a/scripts/upgrade b/scripts/upgrade
index 8ac20f1..96b4297 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -55,7 +55,7 @@ if [ -z "$final_path" ]; then
     ynh_app_setting_set --app=$app --key=final_path --value=$final_path
 fi
 
-if ynh_compare_current_package_version --comparison lt --version "3.6.8~ynh1"
+if ynh_compare_current_package_version --comparison lt --version "3.6.8~ynh2"
 then
     # Add variables to .env config file
     echo -e "\