From c5edeaec034369dd574c0d2b6a4be4703eb8b48f Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Sun, 22 May 2022 09:16:57 +0200
Subject: [PATCH] 5.2.2

---
 conf/app.src    | 4 ++--
 manifest.json   | 2 +-
 scripts/install | 5 ++---
 scripts/upgrade | 3 +--
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/conf/app.src b/conf/app.src
index 347b4e5..482ab15 100755
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/Jermolene/TiddlyWiki5/archive/v5.1.23.tar.gz
-SOURCE_SUM=a35f8a4cb25f1f75e49ec40dcc9b1cd7ef4fb099322507464272be720fdc28d3
+SOURCE_URL=https://github.com/Jermolene/TiddlyWiki5/archive/v5.2.2.tar.gz
+SOURCE_SUM=f381c601df68047dfea8f7479fd07b7d274e039d876ed14904fd7727a8ed0401
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/manifest.json b/manifest.json
index 684da99..6614845 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "Non-linear personal web notebook",
         "fr": "Carnet Web personnel non linéaire"
     },
-    "version": "5.1.23~ynh5",
+    "version": "5.2.2~ynh1",
     "url": "https://tiddlywiki.com/",
     "upstream": {
         "license": "BSD-2-Clause",
diff --git a/scripts/install b/scripts/install
index 35b3a40..74f22eb 100755
--- a/scripts/install
+++ b/scripts/install
@@ -99,7 +99,7 @@ ynh_script_progression --message="Configuring TiddlyWiki..." --weight=2
 
 pushd $final_path
 	ynh_use_nodejs
-	npm install -g tiddlywiki
+	ynh_exec_as $app env $ynh_node_load_PATH $ynh_npm install -g tiddlywiki
 	ynh_exec_as $app env $ynh_node_load_PATH tiddlywiki mynewwiki --init server
 popd
 
@@ -108,8 +108,7 @@ popd
 #=================================================
 ynh_script_progression --message="Configuring a systemd service..." --weight=1
 
-ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file=../conf/systemd.service
-
+env_path="$PATH"
 ynh_add_systemd_config
 
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 532ec7f..6dfb029 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -115,8 +115,7 @@ ynh_install_nodejs --nodejs_version=$nodejs_version
 #=================================================
 ynh_script_progression --message="Upgrading systemd configuration..." --weight=1
 
-ynh_replace_string --match_string="__ENV_PATH__" --replace_string="$PATH" --target_file=../conf/systemd.service
-
+env_path="$PATH"
 ynh_add_systemd_config
 
 #=================================================