From 13ea3f4a1d2b53bbf07450831040f50cf4eb9a52 Mon Sep 17 00:00:00 2001
From: Jules Bertholet <jules.bertholet@quoi.xyz>
Date: Sun, 2 Jan 2022 12:45:04 -0500
Subject: [PATCH] Update to v0.48.9

---
 README.md          | 2 +-
 README_fr.md       | 2 +-
 conf/app.src       | 6 +++---
 manifest.json      | 2 +-
 scripts/_common.sh | 7 ++++++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index 94211fa..fcfaadb 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 ## Overview
 Trilium Notes is an Evernote-like hierarchical note taking application with many advanced features, focused on building a large personal knowledge base.
 
-**Shipped version:** 0.48.7
+**Shipped version:** 0.48.9
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 495a433..406b77e 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -11,7 +11,7 @@ Si vous n'avez pas YunoHost, consultez [le guide](https://yunohost.org/#/install
 ## Vue d'ensemble
 Trilium Notes est une application de prise de note hiérarchique semblable a Evernote, avec maintes fonctions avancées, centrée sur la construction d'une large base de connaissances personnelle.
 
-**Version incluse :** 0.48.7
+**Version incluse :** 0.48.9
 
 ## Captures d'écran
 
diff --git a/conf/app.src b/conf/app.src
index 5cdbaf9..13bbcee 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/zadam/trilium/archive/refs/tags/v0.48.7.tar.gz
-SOURCE_SUM=ac1860e5f45e37daf347eb6aeef0a1eeab61c363e1401b5204a1f9d7b14856a4
+SOURCE_URL=https://github.com/zadam/trilium/archive/refs/tags/v0.48.9.tar.gz
+SOURCE_SUM=fe2dd66cee04e59fa81a81359328acf3fe4591f60aea0aa2aa58f91226d9bf4a
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=v0.48.7.tar.gz
+SOURCE_FILENAME=v0.48.9.tar.gz
 SOURCE_EXTRACT=true
diff --git a/manifest.json b/manifest.json
index 59f5607..8941d83 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "A hierarchical note taking application with focus on building large personal knowledge base",
         "fr": "Une application de prise de note hiérarchique centrée sur la construction d'une large base de connaissances personnelle"
     },
-    "version": "0.48.7~ynh1",
+    "version": "0.48.9~ynh1",
     "url": "https://github.com/zadam/trilium",
     "license": "AGPL-3.0-only",
     "maintainer": {
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 6430929..15d8b53 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -12,7 +12,11 @@ pkg_dependencies="nodejs npm libpng16-16 libpng-dev pkg-config autoconf libtool
 #=================================================
 
 function set_node_vars {
-	ynh_exec_warn_less ynh_install_nodejs --nodejs_version=14
+	nodejs_version=$(ynh_app_setting_get --app=$app --key=nodejs_version)
+	if [ $nodejs_version -ne 16 ]; then 
+		ynh_exec_warn_less ynh_remove_nodejs
+	fi
+	ynh_exec_warn_less ynh_install_nodejs --nodejs_version=16
 	ynh_use_nodejs
 	node_path="$nodejs_path:$(sudo -u $app sh -c 'echo $PATH')"
 }
@@ -25,6 +29,7 @@ function build_node_app {
 	pushd "$final_path"
 		chown -R $app:$app "$final_path"
 		sudo -u $app touch "$final_path/.yarnrc"
+		sudo -u $app env "PATH=$node_path" yarn --cache-folder "$final_path/yarn-cache" --use-yarnrc "$final_path/.yarnrc" import 2>&1
 		sudo -u $app env "PATH=$node_path" yarn --cache-folder "$final_path/yarn-cache" --use-yarnrc "$final_path/.yarnrc" install --production 2>&1
 		chown -R root:root "$final_path"
 	popd