From 8edcc193369888b804615bc5b293b804ec7ebff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Mar 2024 22:51:29 +0100 Subject: [PATCH 1/7] cleaning --- scripts/install | 1 - scripts/upgrade | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/install b/scripts/install index 812e74c..c82fb85 100755 --- a/scripts/install +++ b/scripts/install @@ -16,7 +16,6 @@ source /usr/share/yunohost/helpers #================================================= 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" diff --git a/scripts/upgrade b/scripts/upgrade index a559a01..876a157 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -9,21 +9,14 @@ source _common.sh source /usr/share/yunohost/helpers -upgrade_type=$(ynh_check_app_version_changed) - #================================================= # "REBUILD" THE APP (DEPLOY NEW SOURCES, RERUN NPM BUILD...) #================================================= # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= +ynh_script_progression --message="Upgrading source files..." --weight=1 -if [ "$upgrade_type" == "UPGRADE_APP" ] -then - 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" -fi +ynh_setup_source --dest_dir="$install_dir" chown -R $app:www-data "$install_dir" From 66dd33af495f26aa7cc12ef1b88e942d8eea575e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Mar 2024 23:04:21 +0100 Subject: [PATCH 2/7] fix --- scripts/install | 4 +++- scripts/upgrade | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/install b/scripts/install index c82fb85..9548a40 100755 --- a/scripts/install +++ b/scripts/install @@ -18,6 +18,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" +ynh_replace_string --match_string="define('ENVIRONMENT', 'development');" --replace_string="define('ENVIRONMENT', 'production');" --target_file=$install_dir/index.php + chown -R $app:www-data "$install_dir" #================================================= @@ -34,7 +36,7 @@ ynh_use_logrotate ynh_add_config --template="cron" --destination="/etc/cron.d/$app" chown root: "/etc/cron.d/$app" chmod 644 "/etc/cron.d/$app" - + #================================================= # END OF SCRIPT #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 876a157..c4ed1ce 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -18,6 +18,8 @@ ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_setup_source --dest_dir="$install_dir" +ynh_replace_string --match_string="define('ENVIRONMENT', 'development');" --replace_string="define('ENVIRONMENT', 'production');" --target_file=$install_dir/index.php + chown -R $app:www-data "$install_dir" #================================================= From 46e995d8fefc09c4b8604fdf900aca51e8c0a980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Mar 2024 23:04:58 +0100 Subject: [PATCH 3/7] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index ac78376..e9a053d 100644 --- a/manifest.toml +++ b/manifest.toml @@ -7,7 +7,7 @@ description.fr = "Application Web d'enregistrement radioamateur" version = "2.6.6~ynh1" -maintainers = ["eric_G"] +maintainers = [ ] [upstream] license = "MIT" From 7928bfcb874bbd7865ce1d04d2b9695f3ad60aaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?E=CC=81ric=20Gaspar?= <46165813+ericgaspar@users.noreply.github.com> Date: Thu, 7 Mar 2024 23:05:44 +0100 Subject: [PATCH 4/7] Update cron --- conf/cron | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cron b/conf/cron index 3c66c7b..49ebd2b 100644 --- a/conf/cron +++ b/conf/cron @@ -1,5 +1,5 @@ # Update the Cloudlog installation every day at midnight -0 0 * * * /bin/bash -c "/cloudlog.sh" +#0 0 * * * /bin/bash -c "/cloudlog.sh" # Upload QSOs to Club Log (ignore cron job if this integration is not required) 3 */6 * * * curl --silent https://__DOMAIN__/index.php/clublog/upload &>/dev/null From 69c9df1b7ab7e865073b21fb04ba198678528d2e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 22 Mar 2024 02:31:16 +0100 Subject: [PATCH 5/7] Upgrade to v2.6.7 --- manifest.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest.toml b/manifest.toml index e9a053d..d182e3e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "CloudLog" description.en = "Web based amateur radio logging application" description.fr = "Application Web d'enregistrement radioamateur" -version = "2.6.6~ynh1" +version = "2.6.7~ynh1" maintainers = [ ] @@ -40,8 +40,8 @@ ram.runtime = "50M" [resources.sources] [resources.sources.main] - url = "https://github.com/magicbug/Cloudlog/archive/refs/tags/2.6.6.tar.gz" - sha256 = "98707dc4c967eb305be38db030431a2d58e14f89bd0d89d16ad5980cd4aea92d" + url = "https://github.com/magicbug/Cloudlog/archive/refs/tags/2.6.7.tar.gz" + sha256 = "1a7876aa6eff04f96d22ffd9e35492b79df43923e7af57ad10b2e007a570b321" autoupdate.strategy = "latest_github_tag" [resources.system_user] From 31676a45ce21f3b2c927bd9da773207612bb238e Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 22 Mar 2024 01:31:19 +0000 Subject: [PATCH 6/7] Auto-update README --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e2976a5..eb0e0c9 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Cloudlog is an open-source PHP & MySQL based amateur radio logging application, allowing you to log contacts via a web browser on any device and platform. This is an ideal general-purpose logging application, supporting HF to Microwave, it can even interface with your radio via CAT, sync logs from WSJT-X & if you are a satellite operator integrates with SatPC32. - -**Shipped version:** 2.6.6~ynh1 +**Shipped version:** 2.6.7~ynh1 ## Screenshots @@ -39,7 +38,7 @@ Please send your pull request to the [testing branch](https://github.com/YunoHos To try the testing branch, please proceed like that. -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing --debug or sudo yunohost app upgrade cloudlog -u https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing --debug From 8893000f9fe2fa14943b34178872fcd8f99bfbc3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Fri, 5 Apr 2024 19:54:59 +0000 Subject: [PATCH 7/7] Auto-update READMEs --- ALL_README.md | 6 ++++++ README.md | 13 +++++++------ README_eu.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 28 ++++++++++++++-------------- README_gl.md | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 123 insertions(+), 20 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_eu.md create mode 100644 README_gl.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..77b7509 --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,6 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) diff --git a/README.md b/README.md index eb0e0c9..0367d6a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,16 +9,17 @@ It shall NOT be edited by hand. [![Install CloudLog with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cloudlog) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install CloudLog quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install CloudLog quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview Cloudlog is an open-source PHP & MySQL based amateur radio logging application, allowing you to log contacts via a web browser on any device and platform. This is an ideal general-purpose logging application, supporting HF to Microwave, it can even interface with your radio via CAT, sync logs from WSJT-X & if you are a satellite operator integrates with SatPC32. + **Shipped version:** 2.6.7~ynh1 ## Screenshots @@ -34,9 +35,9 @@ This is an ideal general-purpose logging application, supporting HF to Microwave ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: ```bash sudo yunohost app install https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing --debug diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..4245cad --- /dev/null +++ b/README_eu.md @@ -0,0 +1,48 @@ + + +# CloudLog YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/cloudlog.svg)](https://dash.yunohost.org/appci/app/cloudlog) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/cloudlog.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/cloudlog.maintain.svg) + +[![Instalatu CloudLog YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cloudlog) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek CloudLog YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + +Cloudlog is an open-source PHP & MySQL based amateur radio logging application, allowing you to log contacts via a web browser on any device and platform. + +This is an ideal general-purpose logging application, supporting HF to Microwave, it can even interface with your radio via CAT, sync logs from WSJT-X & if you are a satellite operator integrates with SatPC32. + +**Paketatutako bertsioa:** 2.6.7~ynh1 + +## Pantaila-argazkiak + +![CloudLog(r)en pantaila-argazkia](./doc/screenshots/screenshot.png) + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing --debug +edo +sudo yunohost app upgrade cloudlog -u https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index c8e6cd2..afcb4d4 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # CloudLog pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer CloudLog avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cloudlog) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer CloudLog rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer CloudLog rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -20,7 +20,7 @@ Cloudlog est une application de journalisation radio amateur open-source basée Il s'agit d'une application de journalisation polyvalente idéale, prenant en charge HF vers micro-ondes, elle peut même s'interfacer avec votre radio via CAT, synchroniser les journaux de WSJT-X et si vous êtes un opérateur satellite, s'intègre à SatPC32. -**Version incluse :** 2.6.6~ynh1 +**Version incluse :** 2.6.7~ynh1 ## Captures d’écran @@ -28,21 +28,21 @@ Il s'agit d'une application de journalisation polyvalente idéale, prenant en ch ## Documentations et ressources -- Site officiel de l’app : -- Dépôt de code officiel de l’app : -- YunoHost Store : -- Signaler un bug : +- Site officiel de l’app : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing --debug ou sudo yunohost app upgrade cloudlog -u https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..da13e8d --- /dev/null +++ b/README_gl.md @@ -0,0 +1,48 @@ + + +# CloudLog para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/cloudlog.svg)](https://dash.yunohost.org/appci/app/cloudlog) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/cloudlog.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/cloudlog.maintain.svg) + +[![Instalar CloudLog con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=cloudlog) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar CloudLog de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + +Cloudlog is an open-source PHP & MySQL based amateur radio logging application, allowing you to log contacts via a web browser on any device and platform. + +This is an ideal general-purpose logging application, supporting HF to Microwave, it can even interface with your radio via CAT, sync logs from WSJT-X & if you are a satellite operator integrates with SatPC32. + +**Versión proporcionada:** 2.6.7~ynh1 + +## Capturas de pantalla + +![Captura de pantalla de CloudLog](./doc/screenshots/screenshot.png) + +## Documentación e recursos + +- Web oficial da app: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing --debug +ou +sudo yunohost app upgrade cloudlog -u https://github.com/YunoHost-Apps/cloudlog_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:**