From c08f591b7dd81ab060b3651e26473e29e0a7d3c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 12 May 2024 17:29:34 +0200 Subject: [PATCH] fix --- scripts/_common.sh | 18 +++++++++--------- scripts/install | 4 ++-- scripts/upgrade | 13 ++++++++++++- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 3e08996..195f905 100755 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -12,17 +12,17 @@ nodejs_version=20 mypads_version=1.7.24 # Plugin versions -ep_align_version=0.3.53 -ep_author_hover_version=0.3.37 -ep_comments_page_version=1.0.5 +ep_align_version=0.3.94 +ep_author_hover_version=0.3.55 +ep_comments_page_version=1.0.33 ep_countable_version=0.0.13 ep_delete_empty_pads_version=0.0.10 -ep_font_color_version=0.0.63 -ep_headings2_version=0.2.44 -ep_markdown_version=0.1.50 -ep_spellcheck_version=0.0.43 -ep_subscript_and_superscript_version=0.2.47 -ep_font_size_version=0.4.44 +ep_font_color_version=0.0.86 +ep_headings2_version=0.2.62 +ep_markdown_version=0.1.77 +ep_spellcheck_version=0.0.59 +ep_subscript_and_superscript_version=0.3.7 +ep_font_size_version=0.4.59 #================================================= # PERSONAL HELPERS diff --git a/scripts/install b/scripts/install index 56f4e78..658b49b 100644 --- a/scripts/install +++ b/scripts/install @@ -97,7 +97,7 @@ ynh_script_progression --message="Installing $app..." --weight=90 pushd "$install_dir" ynh_exec_warn_less npm install pnpm -g ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ - pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_align@${ep_align_version} \ ep_author_hover@${ep_author_hover_version} \ ep_delete_empty_pads@${ep_delete_empty_pads_version} \ @@ -105,7 +105,7 @@ pushd "$install_dir" ep_markdown@${ep_markdown_version} \ ep_font_size@${ep_font_size_version} if [ $mypads -eq 1 ]; then - pnpm run install-plugins \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ ep_mypads@${mypads_version} fi popd diff --git a/scripts/upgrade b/scripts/upgrade index 5c5e8c9..98f9f4e 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -165,7 +165,18 @@ ynh_script_progression --message="Upgrading $app..." --weight=10 pushd $install_dir ynh_exec_warn_less npm install pnpm -g - ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH ETHERPAD_PRODUCTION=true bin/installDeps.sh && \ + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ep_align@${ep_align_version} \ + ep_author_hover@${ep_author_hover_version} \ + ep_delete_empty_pads@${ep_delete_empty_pads_version} \ + ep_headings2@${ep_headings2_version} \ + ep_markdown@${ep_markdown_version} \ + ep_font_size@${ep_font_size_version} + if [ $mypads -eq 1 ]; then + ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH pnpm run install-plugins \ + ep_mypads@${mypads_version} + fi popd #=================================================