From 391e223ca8033c7238fa37dcb2451402da1b960a Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 30 Apr 2022 06:24:14 +0000 Subject: [PATCH 1/3] Upgrade to v2.5.279 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 3962ae4..a87ff30 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Requarks/wiki/releases/download/v2.5.278/wiki-js.tar.gz -SOURCE_SUM=db5dda02f2e8267abead628d6411734ab2ef00bf6a1467bef0b4d009e97e5e80 +SOURCE_URL=https://github.com/Requarks/wiki/releases/download/v2.5.279/wiki-js.tar.gz +SOURCE_SUM=e1060d2af0047914894bd94edf46c8fd29ccf6b2e6baf44c47f2ec193efbc2f6 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=false diff --git a/manifest.json b/manifest.json index 4472cc6..2fc6169 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Open source powerful wiki app built on Node.js, Git and Markdown", "fr": "Wiki open source propulsé par Node.js, Git et Markdown" }, - "version": "2.5.278~ynh1", + "version": "2.5.279~ynh1", "url": "https://wiki.js.org/", "upstream": { "license": "AGPL-3.0-or-later", From 34266917742cf7f2d33ccd635c61570a7fb885ba Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 30 Apr 2022 06:24:18 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2c3a4bd..83b8600 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Shipped version:** 2.5.278~ynh1 +**Shipped version:** 2.5.279~ynh1 **Demo:** https://docs-beta.requarks.io/ diff --git a/README_fr.md b/README_fr.md index 5529097..f155d16 100644 --- a/README_fr.md +++ b/README_fr.md @@ -14,7 +14,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Wiki.js is a copylefted libre software, modern and powerful wiki app built on Node.js, Git and Markdown for YunoHost. -**Version incluse :** 2.5.278~ynh1 +**Version incluse :** 2.5.279~ynh1 **Démo :** https://docs-beta.requarks.io/ From 867f348e623f56a9f0485e0498eb1b4435ddc163 Mon Sep 17 00:00:00 2001 From: ericgaspar Date: Sat, 30 Apr 2022 09:10:51 +0200 Subject: [PATCH 3/3] Add ynh_exec_warn_less --- scripts/install | 2 +- scripts/restore | 2 +- scripts/upgrade | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/install b/scripts/install index 1dc6c92..b1fa23b 100644 --- a/scripts/install +++ b/scripts/install @@ -70,7 +70,7 @@ ynh_app_setting_set --app=$app --key=port --value=$port #================================================= ynh_script_progression --message="Installing dependencies..." -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_use_nodejs diff --git a/scripts/restore b/scripts/restore index e5111e1..12585af 100644 --- a/scripts/restore +++ b/scripts/restore @@ -80,7 +80,7 @@ chown -R $app:$app "$final_path" ynh_script_progression --message="Reinstalling dependencies..." # Define and install dependencies -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_use_nodejs diff --git a/scripts/upgrade b/scripts/upgrade index f77ac2d..f1747c5 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -154,7 +154,7 @@ ynh_add_nginx_config #================================================= ynh_script_progression --message="Upgrading dependencies..." -ynh_install_app_dependencies $pkg_dependencies +ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies ynh_remove_nodejs ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_use_nodejs