From 1331610b8fd3388b69ff2ac191e830537b16843d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Sun, 19 Dec 2021 23:39:00 +0100
Subject: [PATCH] Testing (#68)

* 4.3
---
 README.md          | 2 +-
 README_fr.md       | 2 +-
 conf/nginx.conf    | 5 -----
 manifest.json      | 4 ++--
 scripts/_common.sh | 2 +-
 scripts/restore    | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index e82f9a6..76e0a24 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ In addition to constituting an advantage in terms of confidentiality (the data d
 - Ability to subscribe to channels without creating a Google account 
 
 
-**Shipped version:** 21.09.29~ynh1
+**Shipped version:** 21.12.15~ynh1
 
 **Demo:** https://invidious.site/
 
diff --git a/README_fr.md b/README_fr.md
index 24b4257..8e713ae 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -18,7 +18,7 @@ En plus de constituer un avantage sur le plan de la confidentialité (les donné
 - Possibilité d'afficher les commentaires Reddit plutôt que les commentaires YouTube,
 - Possibilité de s'abonner aux chaines sans créer de compte Google
 
-**Version incluse :** 21.09.29~ynh1
+**Version incluse :** 21.12.15~ynh1
 
 **Démo :** https://invidious.site/
 
diff --git a/conf/nginx.conf b/conf/nginx.conf
index 13cd907..346adf0 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,10 +1,5 @@
 #sub_path_only rewrite ^__PATH__$ __PATH__/ permanent;
 location __PATH__/ {
-  
-  # Force usage of https
-  if ($scheme = http) {
-    rewrite ^ https://$server_name$request_uri? permanent;
-  }
 
   proxy_pass        http://127.0.0.1:__PORT__/;
   proxy_redirect    off;
diff --git a/manifest.json b/manifest.json
index 5626f76..539041e 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Alternative front-end to YouTube",
         "fr": "Front-end alternatif à YouTube"
     },
-    "version": "21.09.29~ynh1",
+    "version": "21.12.15~ynh1",
     "url": "https://invidio.us/",
     "upstream": {
         "license": "GPL-3.0-only",
@@ -20,7 +20,7 @@
         "name": "eric_G"
     },
     "requirements": {
-        "yunohost": ">= 4.2.4"
+        "yunohost": ">= 4.3.0"
     },
     "multi_instance": false,
     "services": [
diff --git a/scripts/_common.sh b/scripts/_common.sh
index bacdf17..621fad4 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -4,7 +4,7 @@
 # COMMON VARIABLES
 #=================================================
 
-version_commit=afb284fa9baa4c199f6770651f5a5d4ef01f2d9f
+version_commit=7f3ef1229722adba65ec60caa3d209d18b47fd2e
 
 # dependencies used by the app
 pkg_dependencies="apt-transport-https libssl-dev libxml2-dev libyaml-dev libgmp-dev libreadline-dev postgresql librsvg2-bin imagemagick libsqlite3-dev zlib1g-dev libevent-dev pkg-config libpcre3-dev"
diff --git a/scripts/restore b/scripts/restore
index 4b41556..78969f0 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -38,8 +38,7 @@ db_pwd=$(ynh_app_setting_get --app=$app --key=psqlpwd)
 #=================================================
 ynh_script_progression --message="Validating restoration parameters..." --weight=2
 
-test ! -d $final_path \
-	|| ynh_die --message="There is already a directory: $final_path "
+test ! -d $final_path || ynh_die --message="There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORATION STEPS