From 3c84842acd820047a718702f67526038c00c9949 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 3 Sep 2024 13:02:05 +0200 Subject: [PATCH] cleaning --- manifest.toml | 2 +- scripts/install | 6 +----- scripts/restore | 3 --- scripts/upgrade | 4 ---- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/manifest.toml b/manifest.toml index 74370d2..d8ad063 100644 --- a/manifest.toml +++ b/manifest.toml @@ -21,7 +21,7 @@ cpe = "cpe:2.3:a:koel:koel" fund = "https://opencollective.com/koel" [integration] -yunohost = ">= 11.2.18" +yunohost = ">= 11.2.29" helpers_version = "2.1" architectures = "all" multi_instance = true diff --git a/scripts/install b/scripts/install index b38805a..e073788 100755 --- a/scripts/install +++ b/scripts/install @@ -5,8 +5,6 @@ source /usr/share/yunohost/helpers ynh_app_setting_set --key=php_memory_limit --value=512M -#================================================= -# APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -14,7 +12,6 @@ ynh_script_progression "Setting up source files..." ynh_setup_source --dest_dir="$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================ @@ -24,8 +21,6 @@ ynh_multimedia_build_main_dir ynh_multimedia_addfolder --source_dir="$data_dir" --dest_dir="$app" ynh_multimedia_addaccess $app -#================================================= -# APP INITIAL CONFIGURATION #================================================= # ADD A CONFIGURATION #================================================= @@ -56,4 +51,5 @@ ynh_config_add_nginx #================================================= # END OF SCRIPT #================================================= + ynh_script_progression "Installation of $app completed" diff --git a/scripts/restore b/scripts/restore index fcbe58e..2a5e447 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,6 +1,5 @@ #!/bin/bash -# Keep this path for calling _common.sh inside the execution's context of backup and restore scripts source ../settings/scripts/_common.sh source /usr/share/yunohost/helpers @@ -11,7 +10,6 @@ ynh_script_progression "Restoring the app main directory..." ynh_restore "$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # RESTORE THE DATA DIRECTORY #================================================= @@ -53,7 +51,6 @@ ynh_restore "/etc/nginx/conf.d/$domain.d/$app.conf" #================================================= ynh_script_progression "Reloading NGINX web server and $app's service..." -# Typically you only have either $app or php-fpm but not both at the same time... ynh_systemctl --service=php$php_version-fpm --action=reload ynh_systemctl --service=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 8881e80..3e0d740 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -5,17 +5,13 @@ source /usr/share/yunohost/helpers ynh_app_setting_set_default --key=php_memory_limit --value=512M -#================================================= -# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= ynh_script_progression "Upgrading source files..." -# Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -#REMOVEME? Assuming the install dir is setup using ynh_setup_source, the proper chmod/chowns are now already applied and it shouldn't be necessary to tweak perms | chown -R $app:www-data "$install_dir" #================================================= # REAPPLY SYSTEM CONFIGURATIONS #=================================================