From 85bd8b0e877f0dc2b74723a131836bde95072be1 Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Tue, 2 Sep 2025 22:49:32 +0200 Subject: [PATCH 1/2] [autopatch] Automatic patch to use nodejs/ruby/go/compose resources + remove empty _common.sh --- manifest.toml | 5 ++++- scripts/_common.sh | 7 ------- scripts/backup | 2 +- scripts/change_url | 2 +- scripts/install | 4 ++-- scripts/remove | 4 ++-- scripts/restore | 4 ++-- scripts/upgrade | 4 ++-- 8 files changed, 14 insertions(+), 18 deletions(-) delete mode 100644 scripts/_common.sh diff --git a/manifest.toml b/manifest.toml index 8037f1e..5ca55b1 100644 --- a/manifest.toml +++ b/manifest.toml @@ -18,7 +18,7 @@ demo = "https://send.vis.ee/" code = "https://github.com/timvisee/send" [integration] -yunohost = ">= 12.0.9" +yunohost = ">= 12.1.17" helpers_version = "2.1" architectures = ["amd64", "arm64", "armhf"] multi_instance = true @@ -70,3 +70,6 @@ ram.runtime = "50M" [resources.apt] packages = "redis-server" + + [resources.nodejs] + version = "16" diff --git a/scripts/_common.sh b/scripts/_common.sh deleted file mode 100644 index f5f7b4c..0000000 --- a/scripts/_common.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -#================================================= -# COMMON VARIABLES AND CUSTOM HELPERS -#================================================= - -nodejs_version="16" diff --git a/scripts/backup b/scripts/backup index 50e701d..1d9fb4f 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,6 +1,6 @@ #!/bin/bash -source ../settings/scripts/_common.sh + source /usr/share/yunohost/helpers ynh_print_info "Declaring files to be backed up..." diff --git a/scripts/change_url b/scripts/change_url index ef434ab..072532a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,6 +1,6 @@ #!/bin/bash -source _common.sh + source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/install b/scripts/install index 056a1a5..05caae9 100644 --- a/scripts/install +++ b/scripts/install @@ -1,6 +1,6 @@ #!/bin/bash -source _common.sh + source /usr/share/yunohost/helpers #================================================= @@ -8,7 +8,7 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression "Installing dependencies..." -ynh_nodejs_install +#REMOVEME? ynh_nodejs_install #================================================= # CREATE A REDIS DATABASE diff --git a/scripts/remove b/scripts/remove index f2ae961..0f67c70 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,6 +1,6 @@ #!/bin/bash -source _common.sh + source /usr/share/yunohost/helpers #================================================= @@ -18,7 +18,7 @@ ynh_redis_remove_db "$redis_db" ynh_config_remove_nginx -ynh_nodejs_remove +#REMOVEME? ynh_nodejs_remove #================================================= # END OF SCRIPT diff --git a/scripts/restore b/scripts/restore index a8a434e..a0761e1 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,6 @@ #!/bin/bash -source ../settings/scripts/_common.sh + source /usr/share/yunohost/helpers #================================================= @@ -17,7 +17,7 @@ chmod +x "$install_dir/server/bin/prod.js" #================================================= ynh_script_progression "Reinstalling dependencies..." -ynh_nodejs_install +#REMOVEME? ynh_nodejs_install ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" diff --git a/scripts/upgrade b/scripts/upgrade index 2aba8b3..fa2bc69 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,6 +1,6 @@ #!/bin/bash -source _common.sh + source /usr/share/yunohost/helpers #================================================= @@ -31,7 +31,7 @@ chmod +x "$install_dir/server/bin/prod.js" #================================================= ynh_script_progression "Upgrading dependencies..." -ynh_nodejs_install +#REMOVEME? ynh_nodejs_install #================================================= # NGINX CONFIGURATION From 7b9c7cc947e2dfc64826145486eb28778c8b2191 Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Sun, 28 Sep 2025 13:06:37 +0200 Subject: [PATCH 2/2] cleaning --- scripts/backup | 1 - scripts/change_url | 1 - scripts/install | 8 -------- scripts/remove | 3 --- scripts/restore | 3 --- scripts/upgrade | 8 -------- 6 files changed, 24 deletions(-) diff --git a/scripts/backup b/scripts/backup index 1d9fb4f..18e8cc6 100644 --- a/scripts/backup +++ b/scripts/backup @@ -1,6 +1,5 @@ #!/bin/bash - source /usr/share/yunohost/helpers ynh_print_info "Declaring files to be backed up..." diff --git a/scripts/change_url b/scripts/change_url index 072532a..cb7f89a 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,6 +1,5 @@ #!/bin/bash - source /usr/share/yunohost/helpers #================================================= diff --git a/scripts/install b/scripts/install index 05caae9..5f5a1cb 100644 --- a/scripts/install +++ b/scripts/install @@ -1,15 +1,7 @@ #!/bin/bash - source /usr/share/yunohost/helpers -#================================================= -# INSTALL DEPENDENCIES -#================================================= -ynh_script_progression "Installing dependencies..." - -#REMOVEME? ynh_nodejs_install - #================================================= # CREATE A REDIS DATABASE #================================================= diff --git a/scripts/remove b/scripts/remove index 0f67c70..f6416b0 100644 --- a/scripts/remove +++ b/scripts/remove @@ -1,6 +1,5 @@ #!/bin/bash - source /usr/share/yunohost/helpers #================================================= @@ -18,8 +17,6 @@ ynh_redis_remove_db "$redis_db" ynh_config_remove_nginx -#REMOVEME? ynh_nodejs_remove - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/restore b/scripts/restore index a0761e1..64581cf 100644 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,5 @@ #!/bin/bash - source /usr/share/yunohost/helpers #================================================= @@ -17,8 +16,6 @@ chmod +x "$install_dir/server/bin/prod.js" #================================================= ynh_script_progression "Reinstalling dependencies..." -#REMOVEME? ynh_nodejs_install - ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" ynh_restore "/etc/systemd/system/$app.service" diff --git a/scripts/upgrade b/scripts/upgrade index fa2bc69..d706da7 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,6 +1,5 @@ #!/bin/bash - source /usr/share/yunohost/helpers #================================================= @@ -26,13 +25,6 @@ ynh_setup_source --dest_dir="$install_dir" --keep="server/config.js" --full_repl chmod +x "$install_dir/server/bin/prod.js" -#================================================= -# UPGRADE DEPENDENCIES -#================================================= -ynh_script_progression "Upgrading dependencies..." - -#REMOVEME? ynh_nodejs_install - #================================================= # NGINX CONFIGURATION #=================================================