From 470092bf0eccce6520f9f0fd4742dbbf2551f0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Tue, 21 Feb 2023 10:12:24 +0100
Subject: [PATCH] Fix

---
 scripts/change_url |  2 +-
 scripts/install    | 14 +-------------
 scripts/restore    |  2 +-
 scripts/upgrade    |  4 ++--
 tests.toml         |  6 ------
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/scripts/change_url b/scripts/change_url
index 0225dcf..d87c813 100644
--- a/scripts/change_url
+++ b/scripts/change_url
@@ -34,7 +34,7 @@ ynh_change_url_nginx_config
 domain=$new_domain
 path=${new_path%/}
 
-ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$final_path/config/jupyterhub_config.py"
+ynh_add_config --template="../conf/jupyterhub_config.py" --destination="$install_dir/config/jupyterhub_config.py"
 
 #=================================================
 # GENERIC FINALISATION
diff --git a/scripts/install b/scripts/install
index 9320f94..cef9849 100644
--- a/scripts/install
+++ b/scripts/install
@@ -9,22 +9,10 @@
 source _common.sh
 source /usr/share/yunohost/helpers
 
-#=================================================
-# RETRIEVE ARGUMENTS FROM THE MANIFEST
-#=================================================
-
-enable_terminal=$YNH_APP_ARG_ENABLE_TERMINAL
-
-#=================================================
-# STORE SETTINGS FROM MANIFEST
-#=================================================
-
-ynh_app_setting_set --app=$app --key=enable_terminal --value=$enable_terminal
-
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-#REMOVEME? ynh_script_progression --message="Installing dependencies..." --weight=23
+ynh_script_progression --message="Installing dependencies..." --weight=23
 
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_use_nodejs
diff --git a/scripts/restore b/scripts/restore
index 0b7f279..08d11f0 100644
--- a/scripts/restore
+++ b/scripts/restore
@@ -25,7 +25,7 @@ chown -R $admin: $install_dir/.venv/
 #=================================================
 # REINSTALL DEPENDENCIES
 #=================================================
-#REMOVEME? ynh_script_progression --message="Reinstalling dependencies..." --weight=75
+ynh_script_progression --message="Reinstalling dependencies..." --weight=75
 
 # Define and install dependencies
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
diff --git a/scripts/upgrade b/scripts/upgrade
index 848776a..6bfb5eb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -42,7 +42,7 @@ ynh_add_nginx_config
 #=================================================
 # UPGRADE DEPENDENCIES
 #=================================================
-ynh_script_progression --message="Upgrading dependencies..." --weight=20
+ynh_script_progression --message="Upgrading Node.js..." --weight=3
 
 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_use_nodejs
@@ -57,7 +57,7 @@ python3 -m pip install pipenv
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]
 then
-	ynh_script_progression --message="Building app..." --weight=60
+	ynh_script_progression --message="Building app..." --weight=6
 
 	pushd $install_dir
 		mkdir -p .venv
diff --git a/tests.toml b/tests.toml
index 2eb0b8f..2e199f4 100644
--- a/tests.toml
+++ b/tests.toml
@@ -2,12 +2,6 @@ test_format = 1.0
 
 [default]
 
-    # -------------------------------
-    # Default args to use for install
-    # -------------------------------
-
-    args.enable_terminal = true
-
     # -------------------------------
     # Commits to test upgrade from
     # -------------------------------