From 0634ebaa35fc65c2a774c192f9d91ba96211222e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 11 Jul 2024 03:32:23 +0200 Subject: [PATCH 1/5] Upgrade to v4.1.0 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index 10a4482..8245942 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Directory Lister" description.en = "Expose the contents of any web-accessible folder for browsing and sharing" description.fr = "Exposez le contenu de n'importe quel dossier accessible sur le Web pour la navigation et le partage" -version = "4.0.0~ynh1" +version = "4.1.0~ynh1" maintainers = ["eric_G"] @@ -54,8 +54,8 @@ ram.runtime = "50M" [resources.sources.main] in_subdir = false - url = "https://github.com/DirectoryLister/DirectoryLister/releases/download/4.0.0/DirectoryLister-4.0.0.tar.gz" - sha256 = "535331654d51d822bc4cd83a81a9de6399badc21da9f039a1451bc9a6427f19a" + url = "https://github.com/DirectoryLister/DirectoryLister/archive/refs/tags/4.1.0.tar.gz" + sha256 = "4b2d2eade47ad1f48775bf2b1b66f25131f53ffa1563978dd9b771aedde400ef" autoupdate.strategy = "latest_github_tag" [resources.system_user] From ded72d7a948352a72d0432c064555edfd665ee98 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 11 Jul 2024 01:32:25 +0000 Subject: [PATCH 2/5] Auto-update READMEs --- README.md | 4 ++-- README_es.md | 4 ++-- README_eu.md | 4 ++-- README_fr.md | 4 ++-- README_gl.md | 4 ++-- README_zh_Hans.md | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index efe0877..74390e1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ It shall NOT be edited by hand. # Directory Lister for YunoHost -[![Integration level](https://dash.yunohost.org/integration/directorylister.svg)](https://dash.yunohost.org/appci/app/directorylister) ![Working status](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) +[![Integration level](https://dash.yunohost.org/integration/directorylister.svg)](https://ci-apps.yunohost.org/ci/apps/directorylister/) ![Working status](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) [![Install Directory Lister with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=directorylister) @@ -30,7 +30,7 @@ Directory Lister is the easiest way to expose the contents of any web-accessible - Multi-lingual -**Shipped version:** 4.0.0~ynh1 +**Shipped version:** 4.1.0~ynh1 **Demo:** diff --git a/README_es.md b/README_es.md index 303cdf7..2d90472 100644 --- a/README_es.md +++ b/README_es.md @@ -5,7 +5,7 @@ No se debe editar a mano. # Directory Lister para Yunohost -[![Nivel de integración](https://dash.yunohost.org/integration/directorylister.svg)](https://dash.yunohost.org/appci/app/directorylister) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/directorylister.svg)](https://ci-apps.yunohost.org/ci/apps/directorylister/) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) [![Instalar Directory Lister con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=directorylister) @@ -30,7 +30,7 @@ Directory Lister is the easiest way to expose the contents of any web-accessible - Multi-lingual -**Versión actual:** 4.0.0~ynh1 +**Versión actual:** 4.1.0~ynh1 **Demo:** diff --git a/README_eu.md b/README_eu.md index 70e5c31..0e40ce5 100644 --- a/README_eu.md +++ b/README_eu.md @@ -5,7 +5,7 @@ EZ editatu eskuz. # Directory Lister YunoHost-erako -[![Integrazio maila](https://dash.yunohost.org/integration/directorylister.svg)](https://dash.yunohost.org/appci/app/directorylister) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) +[![Integrazio maila](https://dash.yunohost.org/integration/directorylister.svg)](https://ci-apps.yunohost.org/ci/apps/directorylister/) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) [![Instalatu Directory Lister YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=directorylister) @@ -30,7 +30,7 @@ Directory Lister is the easiest way to expose the contents of any web-accessible - Multi-lingual -**Paketatutako bertsioa:** 4.0.0~ynh1 +**Paketatutako bertsioa:** 4.1.0~ynh1 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 674063d..512741f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -5,7 +5,7 @@ Il NE doit PAS être modifié à la main. # Directory Lister pour YunoHost -[![Niveau d’intégration](https://dash.yunohost.org/integration/directorylister.svg)](https://dash.yunohost.org/appci/app/directorylister) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) +[![Niveau d’intégration](https://dash.yunohost.org/integration/directorylister.svg)](https://ci-apps.yunohost.org/ci/apps/directorylister/) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) [![Installer Directory Lister avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=directorylister) @@ -29,7 +29,7 @@ Directory Lister est le moyen le plus simple d'exposer le contenu de n'importe q - Multilingue -**Version incluse :** 4.0.0~ynh1 +**Version incluse :** 4.1.0~ynh1 **Démo :** diff --git a/README_gl.md b/README_gl.md index 96e90a7..d45ff20 100644 --- a/README_gl.md +++ b/README_gl.md @@ -5,7 +5,7 @@ NON debe editarse manualmente. # Directory Lister para YunoHost -[![Nivel de integración](https://dash.yunohost.org/integration/directorylister.svg)](https://dash.yunohost.org/appci/app/directorylister) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) +[![Nivel de integración](https://dash.yunohost.org/integration/directorylister.svg)](https://ci-apps.yunohost.org/ci/apps/directorylister/) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) [![Instalar Directory Lister con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=directorylister) @@ -30,7 +30,7 @@ Directory Lister is the easiest way to expose the contents of any web-accessible - Multi-lingual -**Versión proporcionada:** 4.0.0~ynh1 +**Versión proporcionada:** 4.1.0~ynh1 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 36dc46e..02614c3 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -5,7 +5,7 @@ # YunoHost 上的 Directory Lister -[![集成程度](https://dash.yunohost.org/integration/directorylister.svg)](https://dash.yunohost.org/appci/app/directorylister) ![工作状态](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) +[![集成程度](https://dash.yunohost.org/integration/directorylister.svg)](https://ci-apps.yunohost.org/ci/apps/directorylister/) ![工作状态](https://ci-apps.yunohost.org/ci/badges/directorylister.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/directorylister.maintain.svg) [![使用 YunoHost 安装 Directory Lister](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=directorylister) @@ -30,7 +30,7 @@ Directory Lister is the easiest way to expose the contents of any web-accessible - Multi-lingual -**分发版本：** 4.0.0~ynh1 +**分发版本：** 4.1.0~ynh1 **演示：** From d753c306e6833a533102df25d646e0632cba45ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 14 Jul 2024 17:30:01 +0200 Subject: [PATCH 3/5] Coding style --- manifest.toml | 21 ++++++++++++++------- scripts/backup | 8 +------- scripts/change_url | 2 -- scripts/install | 28 +++++++++++----------------- scripts/remove | 6 +----- scripts/restore | 12 +++--------- scripts/upgrade | 28 +++++++++++----------------- sources/extra_files/app/.gitignore | 2 -- sources/patches/.gitignore | 2 -- 9 files changed, 41 insertions(+), 68 deletions(-) delete mode 100644 sources/extra_files/app/.gitignore delete mode 100644 sources/patches/.gitignore diff --git a/manifest.toml b/manifest.toml index 8245942..c9def5a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -1,3 +1,5 @@ +#:schema https://raw.githubusercontent.com/YunoHost/apps/master/schemas/manifest.v2.schema.json + packaging_format = 2 id = "directorylister" @@ -44,7 +46,7 @@ ram.runtime = "50M" [install.language] ask.en = "Choose the application language" ask.fr = "Choisissez la langue de l'application" - type = "string" + type = "select" choices = ["fr", "en"] default = "fr" @@ -52,11 +54,11 @@ ram.runtime = "50M" [resources.sources] - [resources.sources.main] - in_subdir = false - url = "https://github.com/DirectoryLister/DirectoryLister/archive/refs/tags/4.1.0.tar.gz" - sha256 = "4b2d2eade47ad1f48775bf2b1b66f25131f53ffa1563978dd9b771aedde400ef" - autoupdate.strategy = "latest_github_tag" + [resources.sources.main] + in_subdir = false + url = "https://github.com/DirectoryLister/DirectoryLister/archive/refs/tags/4.1.0.tar.gz" + sha256 = "4b2d2eade47ad1f48775bf2b1b66f25131f53ffa1563978dd9b771aedde400ef" + autoupdate.strategy = "latest_github_tag" [resources.system_user] @@ -66,4 +68,9 @@ ram.runtime = "50M" main.url = "/" [resources.apt] - packages = "php8.2-fpm, php8.2-fileinfo, php8.2-dom, php8.2-zip" + packages = [ + "php8.2-fpm", + "php8.2-fileinfo", + "php8.2-dom", + "php8.2-zip", + ] diff --git a/scripts/backup b/scripts/backup index 18f83fe..03eff4f 100755 --- a/scripts/backup +++ b/scripts/backup @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -22,15 +20,11 @@ ynh_print_info --message="Declaring files to be backed up..." ynh_backup --src_path="$install_dir" #================================================= -# BACKUP THE NGINX CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_backup --src_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# BACKUP THE PHP-FPM CONFIGURATION -#================================================= - ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= diff --git a/scripts/change_url b/scripts/change_url index 4ba8cf7..cfcb0d6 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC STARTING #================================================= # IMPORT GENERIC HELPERS #================================================= diff --git a/scripts/install b/scripts/install index 8be7c4e..32620b3 100755 --- a/scripts/install +++ b/scripts/install @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -9,8 +7,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# APP "BUILD" (DEPLOYING SOURCES, VENV, COMPILING ETC) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -19,7 +15,17 @@ ynh_script_progression --message="Setting up source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" + +#================================================= +# ADD A CONFIGURATION +#================================================= +ynh_script_progression --message="Adding a configuration file..." --weight=1 + +ynh_add_config --template=".env.example" --destination="$install_dir/.env" + +chmod 400 "$install_dir/.env" +chown "$app:$app" "$install_dir/.env" #================================================= # SYSTEM CONFIGURATION @@ -32,18 +38,6 @@ ynh_add_fpm_config # Create a dedicated NGINX config using the conf/nginx.conf template ynh_add_nginx_config -#================================================= -# APP INITIAL CONFIGURATION -#================================================= -# ADD A CONFIGURATION -#================================================= -ynh_script_progression --message="Adding a configuration file..." --weight=1 - -ynh_add_config --template=".env.example" --destination="$install_dir/.env" - -chmod 400 "$install_dir/.env" -chown $app:$app "$install_dir/.env" - #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/remove b/scripts/remove index f717a6a..d15ed06 100755 --- a/scripts/remove +++ b/scripts/remove @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -10,9 +8,7 @@ source _common.sh source /usr/share/yunohost/helpers #================================================= -# REMOVE SYSTEM CONFIGURATIONS -#================================================= -# REMOVE SYSTEMD SERVICE +# REMOVE SYSTEMD SERVICE #================================================= ynh_script_progression --message="Removing system configurations related to $app..." --weight=1 diff --git a/scripts/restore b/scripts/restore index 99cabb7..15ebd20 100755 --- a/scripts/restore +++ b/scripts/restore @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -17,12 +15,10 @@ ynh_script_progression --message="Restoring the app main directory..." --weight= ynh_restore_file --origin_path="$install_dir" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" #================================================= -# RESTORE SYSTEM CONFIGURATIONS -#================================================= -# RESTORE THE PHP-FPM CONFIGURATION +# SYSTEM CONFIGURATION #================================================= ynh_script_progression --message="Restoring system configurations related to $app..." --weight=1 @@ -30,15 +26,13 @@ ynh_restore_file --origin_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" ynh_restore_file --origin_path="/etc/nginx/conf.d/$domain.d/$app.conf" -#================================================= -# GENERIC FINALIZATION #================================================= # RELOAD NGINX AND PHP-FPM OR THE APP SERVICE #================================================= ynh_script_progression --message="Reloading NGINX web server and $app's service..." --weight=1 # Typically you only have either $app or php-fpm but not both at the same time... -ynh_systemd_action --service_name=php$phpversion-fpm --action=reload +ynh_systemd_action --service_name="php$phpversion-fpm" --action=reload ynh_systemd_action --service_name=nginx --action=reload diff --git a/scripts/upgrade b/scripts/upgrade index 1e5ccc4..1251d4a 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -1,7 +1,5 @@ #!/bin/bash -#================================================= -# GENERIC START #================================================= # IMPORT GENERIC HELPERS #================================================= @@ -9,8 +7,6 @@ source _common.sh source /usr/share/yunohost/helpers -#================================================= -# "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= @@ -19,7 +15,17 @@ ynh_script_progression --message="Upgrading source files..." --weight=1 # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source --dest_dir="$install_dir" --keep=".env" -chown -R $app:www-data "$install_dir" +chown -R "$app:www-data" "$install_dir" + +#================================================= +# UPDATE A CONFIG FILE +#================================================= +# ynh_script_progression --message="Updating a configuration file..." --weight=1 + +# ynh_add_config --template=".env.example" --destination="$install_dir/.env" + +# chmod 400 "$install_dir/.env" +# chown $app:$app "$install_dir/.env" #================================================= # REAPPLY SYSTEM CONFIGURATIONS @@ -30,18 +36,6 @@ ynh_add_fpm_config ynh_add_nginx_config -#================================================= -# RECONFIGURE THE APP (UPDATE CONF, APPLY MIGRATIONS...) -#================================================= -# UPDATE A CONFIG FILE -#================================================= -#ynh_script_progression --message="Updating a configuration file..." --weight=1 - -#ynh_add_config --template=".env.example" --destination="$install_dir/.env" - -#chmod 400 "$install_dir/.env" -#chown $app:$app "$install_dir/.env" - #================================================= # END OF SCRIPT #================================================= diff --git a/sources/extra_files/app/.gitignore b/sources/extra_files/app/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/extra_files/app/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] diff --git a/sources/patches/.gitignore b/sources/patches/.gitignore deleted file mode 100644 index 783a4ae..0000000 --- a/sources/patches/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -*~ -*.sw[op] From 6a73aea1d90aaf9fb80c0c07a039908cb80af29d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 14 Jul 2024 17:32:39 +0200 Subject: [PATCH 4/5] Fix autoupdaet --- manifest.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index c9def5a..f00d615 100644 --- a/manifest.toml +++ b/manifest.toml @@ -58,7 +58,9 @@ ram.runtime = "50M" in_subdir = false url = "https://github.com/DirectoryLister/DirectoryLister/archive/refs/tags/4.1.0.tar.gz" sha256 = "4b2d2eade47ad1f48775bf2b1b66f25131f53ffa1563978dd9b771aedde400ef" - autoupdate.strategy = "latest_github_tag" + + autoupdate.strategy = "latest_github_release" + autoupdate.asset = "DirectoryLister-.*\\.tar\\.gz" [resources.system_user] From 3bbe719126a57d9a73dd0dcdec75eb579c2d0697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 14 Jul 2024 17:33:07 +0200 Subject: [PATCH 5/5] fix asset url --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index f00d615..f179023 100644 --- a/manifest.toml +++ b/manifest.toml @@ -56,8 +56,8 @@ ram.runtime = "50M" [resources.sources.main] in_subdir = false - url = "https://github.com/DirectoryLister/DirectoryLister/archive/refs/tags/4.1.0.tar.gz" - sha256 = "4b2d2eade47ad1f48775bf2b1b66f25131f53ffa1563978dd9b771aedde400ef" + url = "https://github.com/DirectoryLister/DirectoryLister/releases/download/4.1.0/DirectoryLister-4.1.0.tar.gz" + sha256 = "94d462f5097cba7c362ce33b841bb8975f5f6553ebfdb0ac4b36c4b4b8760d00" autoupdate.strategy = "latest_github_release" autoupdate.asset = "DirectoryLister-.*\\.tar\\.gz"