From d4fd9f07d5c683b4d7ebde7eb8fd513369b1d441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 23 Nov 2021 07:42:12 +0100
Subject: [PATCH] Testing (#68)

* 4.3
---
 .github/workflows/updater.sh | 3 ---
 README.md                    | 2 +-
 README_fr.md                 | 2 +-
 conf/nginx.conf              | 4 ----
 manifest.json                | 4 ++--
 scripts/install              | 2 +-
 scripts/upgrade              | 2 +-
 7 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
index 88338a3..1e2f8ef 100644
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@@ -116,9 +116,6 @@ done
 # GENERIC FINALIZATION
 #=================================================
 
-# Install moreutils, needed for sponge
-sudo apt-get install moreutils
-
 # Replace new version in manifest
 echo "$(jq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.json)" > manifest.json
 
diff --git a/README.md b/README.md
index d288478..b50fe7b 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ CodiMD is the free software version of HackMD, developed and opened source by th
 
 CodiMD is perfect for open communities, while HackMD emphasizes on permission and access controls for commercial use cases.
 
-**Shipped version:** 2.4.1~ynh3
+**Shipped version:** 2.4.1~ynh4
 
 
 
diff --git a/README_fr.md b/README_fr.md
index 4f23b28..52c5409 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -15,7 +15,7 @@ CodiMD est la version logicielle libre de HackMD, développée et ouverte par l'
 
 CodiMD est parfait pour les communautés ouvertes, tandis que HackMD met l'accent sur les autorisations et les contrôles d'accès pour les cas d'utilisation commerciale.
 
-**Version incluse :** 2.4.1~ynh3
+**Version incluse :** 2.4.1~ynh4
 
 
 
diff --git a/conf/nginx.conf b/conf/nginx.conf
index eb64297..c43334b 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -1,8 +1,4 @@
 location / {
-  # 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 227fdc8..b31ae65 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Collaborative editor to work on notes written in Markdown",
         "fr": "Éditeur collaboratif pour travailler sur des notes en Markdown"
     },
-    "version": "2.4.1~ynh3",
+    "version": "2.4.1~ynh4",
     "url": "https://github.com/hackmdio/codimd",
     "upstream": {
         "license": "AGPL-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/install b/scripts/install
index b1a3e19..857684b 100644
--- a/scripts/install
+++ b/scripts/install
@@ -119,7 +119,7 @@ ynh_script_progression --message="Building CodiMD... (this will take some time a
 pushd $final_path
 	ynh_use_nodejs
 	ynh_exec_as $app env $ynh_node_load_PATH bin/setup
-	ynh_exec_as $app env $ynh_node_load_PATH npm run build
+	ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm run build
 popd
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 62f8620..beaa315 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -136,7 +136,7 @@ then
 	pushd "$final_path"
 		ynh_use_nodejs
 		ynh_exec_warn_less bin/setup
-		ynh_exec_warn_less ynh_npm run build
+		ynh_exec_warn_less $ynh_npm run build
 	popd
 fi