diff --git a/scripts/change_url b/scripts/change_url index 0a5757f..052872e 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -14,14 +14,14 @@ source /usr/share/yunohost/helpers #================================================= # STOP SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Stopping a systemd service..." +ynh_script_progression --message="Stopping a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="stop" --log_path="systemd" #================================================= # MODIFY URL IN NGINX CONF #================================================= -ynh_script_progression --message="Updating NGINX web server configuration..." +ynh_script_progression --message="Updating NGINX web server configuration..." --weight=1 ynh_change_url_nginx_config @@ -41,7 +41,7 @@ ynh_add_config --template="jupyterhub_config.py" --destination="$install_dir/con #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." +ynh_script_progression --message="Starting a systemd service..." --weight=1 # Start a systemd service ynh_systemd_action --service_name=$app --action="start" --line_match="JupyterHub is now running at" --log_path="systemd" diff --git a/scripts/install b/scripts/install index 28dc757..c038859 100644 --- a/scripts/install +++ b/scripts/install @@ -12,7 +12,7 @@ source /usr/share/yunohost/helpers #================================================= # INSTALL DEPENDENCIES #================================================= -ynh_script_progression --message="Installing dependencies..." --weight=23 +ynh_script_progression --message="Installing dependencies..." --weight=15 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version diff --git a/scripts/remove b/scripts/remove index 1421194..fefca71 100644 --- a/scripts/remove +++ b/scripts/remove @@ -14,6 +14,7 @@ source /usr/share/yunohost/helpers #================================================= # REMOVE SERVICE INTEGRATION IN YUNOHOST #================================================= +ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 # Remove the service from the list of services known by YunoHost (added from `yunohost service add`) if ynh_exec_warn_less yunohost service status $app >/dev/null diff --git a/scripts/restore b/scripts/restore index 956a5b3..c48d6a2 100644 --- a/scripts/restore +++ b/scripts/restore @@ -25,7 +25,7 @@ chown -R $admin: $install_dir/venv/ #================================================= # REINSTALL DEPENDENCIES #================================================= - ynh_script_progression --message="Reinstalling dependencies..." --weight=75 + ynh_script_progression --message="Reinstalling dependencies..." --weight=15 ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version ynh_use_nodejs diff --git a/scripts/upgrade b/scripts/upgrade index 4ff3921..a86dae3 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -43,7 +43,7 @@ $ynh_npm install -g configurable-http-proxy npm if [ "$upgrade_type" == "UPGRADE_APP" ] then - ynh_script_progression --message="Building app..." --weight=160 + ynh_script_progression --message="Building app..." --weight=15 #REMOVEME? ynh_secure_remove $install_dir/.venv python3 -m venv $install_dir/venv @@ -57,7 +57,7 @@ fi #================================================= # UPDATE A CONFIG FILE #================================================= -ynh_script_progression --message="Updating a configuration file..." +ynh_script_progression --message="Updating a configuration file..." --weight=1 mkdir -p "$install_dir/config" @@ -72,7 +72,7 @@ chown -R $admin: $install_dir/venv/ #================================================= # SETUP SYSTEMD #================================================= -ynh_script_progression --message="Upgrading systemd configuration..." +ynh_script_progression --message="Upgrading systemd configuration..." --weight=1 # Create a dedicated systemd config ynh_add_systemd_config @@ -84,7 +84,7 @@ yunohost service add $app --description="Console environment for running Python #================================================= # START SYSTEMD SERVICE #================================================= -ynh_script_progression --message="Starting a systemd service..." +ynh_script_progression --message="Starting a systemd service..." --weight=1 ynh_systemd_action --service_name=$app --action="start" --line_match="JupyterHub is now running at" --log_path="systemd"