From 70ef63ea7e6e9eb646f68bcb9b1d566840903712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Mon, 2 Sep 2024 08:58:19 +0200
Subject: [PATCH] cleaning

---
 manifest.toml   | 2 +-
 scripts/install | 7 ++-----
 scripts/restore | 2 --
 scripts/upgrade | 7 ++-----
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index e9a16d5..e6b2750 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -19,7 +19,7 @@ admindoc = "https://scratch-wiki.info/wiki/Scratch_3.0"
 code = "https://github.com/scratchfoundation/scratch-gui"
 
 [integration]
-yunohost = ">= 11.2.18"
+yunohost = ">= 11.2.29"
 helpers_version = "2.1"
 architectures = "all"
 multi_instance = true
diff --git a/scripts/install b/scripts/install
index 5f0946d..e8de33c 100644
--- a/scripts/install
+++ b/scripts/install
@@ -18,8 +18,6 @@ ynh_script_progression "Setting up source files..."
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir/sources"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir"
 #=================================================
 # Build
 #=================================================
@@ -27,14 +25,13 @@ ynh_script_progression "Installing $app..."
 
 pushd "$install_dir/sources"
 
-    ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install
-    ynh_hide_warnings ynh_exec_as_app node_load_PATH" BUILD_MODE=dist npm run build
+    ynh_hide_warnings ynh_exec_as_app npm install
+    ynh_hide_warnings ynh_exec_as_app BUILD_MODE=dist npm run build
 popd
 
 mv "$install_dir/sources/build" "$install_dir/www"
 ynh_safe_rm "$install_dir/sources"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir"
 #=================================================
 # SYSTEM CONFIGURATION
 #=================================================
diff --git a/scripts/restore b/scripts/restore
index bcc3e05..ad19b7a 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -15,8 +15,6 @@ ynh_script_progression "Restoring the app main directory..."
 
 ynh_restore "$install_dir"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir"
 #=================================================
 # RESTORE THE NGINX CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index c9840ea..8250f0c 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -22,8 +22,6 @@ ynh_script_progression "Upgrading source files..."
 # Download, check integrity, uncompress and patch the source from app.src
 ynh_setup_source --dest_dir="$install_dir/sources" --full_replace
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chmod -R o-rwx "$install_dir"
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir"
 #=================================================
 # Build
 #=================================================
@@ -31,15 +29,14 @@ ynh_script_progression "Installing $app..."
 
 pushd "$install_dir/sources"
 
-    ynh_hide_warnings ynh_exec_as_app node_load_PATH" npm install
-    ynh_hide_warnings ynh_exec_as_app node_load_PATH" BUILD_MODE=dist npm run build
+    ynh_hide_warnings ynh_exec_as_app npm install
+    ynh_hide_warnings ynh_exec_as_app BUILD_MODE=dist npm run build
 popd
 
 ynh_safe_rm "$install_dir/www"
 mv "$install_dir/sources/build" "$install_dir/www"
 ynh_safe_rm "$install_dir/sources"
 
-#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R "$app:www-data" "$install_dir"
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
 #=================================================