diff --git a/scripts/install b/scripts/install index f0d0862..e30d975 100755 --- a/scripts/install +++ b/scripts/install @@ -15,7 +15,7 @@ source /usr/share/yunohost/helpers ynh_script_progression --message="Installing dependencies..." --weight=1 # Install nodejs -ynh_install_nodejs --nodejs_version=$NODEJS_VERSION 2>&1 +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -62,12 +62,10 @@ chown $app:$app "$install_dir/apps/www/.env" pushd "$install_dir" ynh_use_nodejs - ynh_script_progression --message="Cleaning cache... " --weight=3 - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000 2>&1 - ynh_script_progression --message="Cleaning cache... " --weight=3 - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean 2>&1 - ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn build 2>&1 + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn install --network-timeout 1000000000 + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn cache clean + ynh_exec_warn_less sudo -u $app env $ynh_node_load_PATH yarn build popd #================================================= diff --git a/scripts/restore b/scripts/restore index 3c0cd45..87f018f 100755 --- a/scripts/restore +++ b/scripts/restore @@ -42,7 +42,7 @@ ynh_install_nodejs --nodejs_version=$NODEJS_VERSION 2>&1 #================================================= # RESTORE THE NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Restoring the NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Restoring the NGINX web server configuration..." --weight=1 ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 1e1f83d..251f4a1 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -45,12 +45,12 @@ chown -R $app:www-data "$install_dir" ynh_script_progression --message="Upgrading dependencies..." --weight=1 # Install nodejs -ynh_install_nodejs --nodejs_version=$NODEJS_VERSION 2>&1 +ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$NODEJS_VERSION #================================================= # NGINX CONFIGURATION #================================================= -ynh_script_progression --message="Upgrading NGINX web server configuration..." --time --weight=1 +ynh_script_progression --message="Upgrading NGINX web server configuration..." --weight=1 # Create a dedicated NGINX config ynh_add_nginx_config