From 095b22fe1dd7fe9f2a619bbbd6a2a4c57d5539ce Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sun, 7 Feb 2021 16:30:47 +0100 Subject: [PATCH] Upgrade to nodeJS 14 --- manifest.json | 6 +++--- scripts/_common.sh | 2 +- scripts/change_url | 4 ++-- scripts/install | 2 +- scripts/restore | 4 ++-- scripts/upgrade | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest.json b/manifest.json index 52b6cb3..e361b41 100644 --- a/manifest.json +++ b/manifest.json @@ -3,10 +3,10 @@ "id": "wikijs", "packaging_format": 1, "description": { - "en": "An open source, modern and powerful wiki app built on Node.js, Git and Markdown.", - "fr": "Un wiki moderne et open source propulsé Node.js, Git et Markdown." + "en": "Open source, modern and powerful wiki app built on Node.js, Git and Markdown.", + "fr": "Wiki moderne et open source propulsé Node.js, Git et Markdown." }, - "version": "2.5.170~ynh2", + "version": "2.5.170~ynh3", "url": "https://wiki.js.org/", "license": "AGPL-3.0-or-later", "maintainer": { diff --git a/scripts/_common.sh b/scripts/_common.sh index 9145635..2d1d65e 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -7,7 +7,7 @@ # dependencies used by the app pkg_dependencies="postgresql postgresql-contrib" -NODEJS_VERSION=12 +NODEJS_VERSION=14 #================================================= # PERSONAL HELPERS diff --git a/scripts/change_url b/scripts/change_url index 1e796e5..b721999 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -70,7 +70,7 @@ fi #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped wikijs service" +ynh_systemd_action --service_name=$app --action=stop --log_path=systemd --line_match="Stopped wikijs service" #================================================= # MODIFY URL IN NGINX CONF @@ -109,7 +109,7 @@ fi ynh_script_progression --message="Starting a systemd service..." # Start a systemd service -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="HTTP Server:" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="HTTP Server:" #================================================= # RELOAD NGINX diff --git a/scripts/install b/scripts/install index 84489e5..7959da0 100644 --- a/scripts/install +++ b/scripts/install @@ -73,7 +73,7 @@ ynh_script_progression --message="Installing dependencies..." ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_use_nodejs -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE A POSTGRESQL DATABASE diff --git a/scripts/restore b/scripts/restore index 34e581e..311e47a 100644 --- a/scripts/restore +++ b/scripts/restore @@ -76,7 +76,7 @@ ynh_system_user_create --username=$app --home_dir="$final_path" ynh_script_progression --message="Restoring user rights..." # Restore permissions on app files -chown -R "$app":"$app" "$final_path" +chown -R $app: "$final_path" #================================================= # SPECIFIC RESTORATION @@ -88,7 +88,7 @@ ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_use_nodejs -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # RESTORE THE POSTGRESQL DATABASE diff --git a/scripts/upgrade b/scripts/upgrade index a6f35d4..ade440b 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -117,7 +117,7 @@ ynh_abort_if_errors #================================================= ynh_script_progression --message="Stopping a systemd service..." -ynh_systemd_action --service_name=$app --action="stop" --log_path=systemd --line_match="Stopped wikijs service" +ynh_systemd_action --service_name=$app --action=stop --log_path=systemd --line_match="Stopped wikijs service" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE @@ -166,7 +166,7 @@ ynh_script_progression --message="Upgrading dependencies..." ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_use_nodejs -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies #================================================= # CREATE DEDICATED USER @@ -224,7 +224,7 @@ yunohost service add $app --description="$app daemon for Wiki.js" --log="/var/lo #================================================= ynh_script_progression --message="Starting a systemd service..." -ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --line_match="HTTP Server:" +ynh_systemd_action --service_name=$app --action=start --log_path=systemd --line_match="HTTP Server:" #================================================= # RELOAD NGINX