From 15e25666a6045a581af30bde3935e07916889123 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 19 Aug 2018 18:43:38 +0200 Subject: [PATCH 1/3] Upgrade to 1.7.0 Upgrade Etherpad to 1.7.0 Mypads module to 1.6.2 And nodejs to major version 6. (Version 8 is currently failing to build some modules) --- README.md | 4 ++-- README_fr.md | 4 ++-- manifest.json | 2 +- scripts/_variables | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index e130197..f733235 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ If you don't have YunoHost, please see [here](https://yunohost.org/#/install) to Etherpad is a highly customizable Open Source online editor providing collaborative editing in really real-time. This package will install the same plugins than [Framapad](https://framapad.org/). -**Shipped version:** 1.6.5 +**Shipped version:** 1.7.0 ## Screenshots @@ -29,7 +29,7 @@ Or, you can find a config file for etherpad at this path `/var/www/etherpad_mypa ## Documentation - * Official documentation: http://etherpad.org/doc/v1.6.5 + * Official documentation: http://etherpad.org/doc/v1.7.0 * YunoHost documentation: There no other documentations, feel free to contribute. ## YunoHost specific features diff --git a/README_fr.md b/README_fr.md index 4d5e6c8..b6b605c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -12,7 +12,7 @@ Si vous n'avez pas YunoHost, merci de regarder [ici](https://yunohost.org/#/inst Etherpad est un éditeur en ligne Open Source hautement personnalisable qui permet l'édition collaborative en temps réel. Ce paquet installera les mêmes plugins que [Framapad](https://framapad.org/). -**Version embarquée:** 1.6.5 +**Version embarquée:** 1.7.0 ## Captures d'écran @@ -29,7 +29,7 @@ Ou, vous pouvez trouver un fichier de configuration pour etherpad à `/var/www/e ## Documentation - * Documentation officielle: http://etherpad.org/doc/v1.6.5 + * Documentation officielle: http://etherpad.org/doc/v1.7.0 * Documentation YunoHost: Il n'y a pas d'autre documentation, n'hésitez pas à contribuer. ## Fonctionnalités spécifiques à YunoHost diff --git a/manifest.json b/manifest.json index 9289ca0..40a4a03 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Framapad clone, a online editor providing collaborative editing in real-time.", "fr": "Clone de Framapad, un éditeur en ligne fournissant l'édition collaborative en temps réel." }, - "version": "1.6.5~ynh4", + "version": "1.7.0~ynh1", "url": "https://framapad.org", "license": "Apache-2.0", "maintainer": { diff --git a/scripts/_variables b/scripts/_variables index c5103fb..a20c68e 100644 --- a/scripts/_variables +++ b/scripts/_variables @@ -7,8 +7,8 @@ abiword_app_depencencies="abiword" libreoffice_app_dependencies="unoconv libreoffice-writer" # Version of nodejs -nodejs_version=4 +nodejs_version=6 # Version of mypads # This variable is mostly used to force an upgrade of the package in case of new versions of mypads. -mypads_version=1.4.6 +mypads_version=1.6.2 From 34a41539f16f6de6c8a35fc71cce3c757e647214 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 19 Aug 2018 18:56:11 +0200 Subject: [PATCH 2/3] Modify also app.src... --- conf/app.src | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/app.src b/conf/app.src index 6ea84b2..9ccb9c8 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.6.5.tar.gz -SOURCE_SUM=e0c5fac06a4ec37cfba66f4514bc27ef +SOURCE_URL=https://github.com/ether/etherpad-lite/archive/1.7.0.tar.gz +SOURCE_SUM=71fe286cf3e8dc45b0b5963de54f2ff6 SOURCE_SUM_PRG=md5sum ARCH_FORMAT=tar.gz SOURCE_IN_SUBDIR=true From 205f1e0beeb37a104d48b63dce3f7751f01f3e74 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Wed, 22 Aug 2018 18:35:29 +0200 Subject: [PATCH 3/3] Fix modules upgrade --- scripts/upgrade | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 17d2a78..7941647 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -158,13 +158,13 @@ npm cache clean ynh_exec_warn_less npm update) # Then update the additionnal modules +(cd "$final_path" +npm cache clean while read node_module do echo "Update $node_module" - (cd "$final_path/node_modules/$node_module" - npm cache clean - ynh_exec_warn_less npm update || true) -done <<< "$(ls -1 "$final_path/node_modules")" + ynh_exec_warn_less npm install --upgrade $node_module || true +done <<< "$(ls -1 "$final_path/node_modules" | grep "^ep_")") #================================================= # SPECIFIC UPGRADE