Merge pull request #39 from YunoHost-Apps/testing

Testing

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)

README.md

@@ -1,5 +1,5 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
+N.B.: This README was automatically generated by <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
 It shall NOT be edited by hand.
 -->
 
@@ -9,10 +9,10 @@ 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.
+> *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.*
+> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.*
 
 ## Overview
 
@@ -20,7 +20,7 @@ Cloudlog is an open-source PHP & MySQL based amateur radio logging application,
 
 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
 
@@ -35,11 +35,11 @@ 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
+```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

README_eu.md

@@ -0,0 +1,48 @@
+<!--
+Ohart ongi: README hau automatikoki sortu da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>ri esker
+EZ editatu eskuz.
+-->
+
+# 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: <https://www.cloudlog.co.uk>
+- Jatorrizko aplikazioaren kode-gordailua: <https://github.com/magicbug/Cloudlog>
+- YunoHost Denda: <https://apps.yunohost.org/app/cloudlog>
+- Eman errore baten berri: <https://github.com/YunoHost-Apps/cloudlog_ynh/issues>
+
+## 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:** <https://yunohost.org/packaging_apps>

README_fr.md

@@ -1,6 +1,6 @@
 <!--
-N.B.: This README was automatically generated by https://github.com/YunoHost/apps/tree/master/tools/readme_generator
+Nota bene : ce README est automatiquement généré par <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
-It shall NOT be edited by hand.
+Il NE doit PAS être modifié à la main.
 -->
 
 # 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.
+> *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.*
+> *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 : <https://www.cloudlog.co.uk>
+- Site officiel de l’app : <https://www.cloudlog.co.uk>
-- Dépôt de code officiel de l’app : <https://github.com/magicbug/Cloudlog>
+- Dépôt de code officiel de l’app : <https://github.com/magicbug/Cloudlog>
-- YunoHost Store : <https://apps.yunohost.org/app/cloudlog>
+- YunoHost Store : <https://apps.yunohost.org/app/cloudlog>
-- Signaler un bug : <https://github.com/YunoHost-Apps/cloudlog_ynh/issues>
+- Signaler un bug : <https://github.com/YunoHost-Apps/cloudlog_ynh/issues>
 
 ## 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 :** <https://yunohost.org/packaging_apps>
+**Plus d’infos sur le packaging d’applications :** <https://yunohost.org/packaging_apps>

README_gl.md

@@ -0,0 +1,48 @@
+<!--
+NOTA: Este README foi creado automáticamente por <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+NON debe editarse manualmente.
+-->
+
+# 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: <https://www.cloudlog.co.uk>
+- Repositorio de orixe do código: <https://github.com/magicbug/Cloudlog>
+- Tenda YunoHost: <https://apps.yunohost.org/app/cloudlog>
+- Informar dun problema: <https://github.com/YunoHost-Apps/cloudlog_ynh/issues>
+
+## 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:** <https://yunohost.org/packaging_apps>

conf/cron

@@ -1,5 +1,5 @@
 # Update the Cloudlog installation every day at midnight
-0 0 * * * /bin/bash -c "<Full-Path-To-Bash-Script>/cloudlog.sh"
+#0 0 * * * /bin/bash -c "<Full-Path-To-Bash-Script>/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

manifest.toml

@@ -5,9 +5,9 @@ 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 = ["eric_G"]
+maintainers = [ ]
 
 [upstream]
 license = "MIT"
@@ -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"
+        url = "https://github.com/magicbug/Cloudlog/archive/refs/tags/2.6.7.tar.gz"
-        sha256 = "98707dc4c967eb305be38db030431a2d58e14f89bd0d89d16ad5980cd4aea92d"
+        sha256 = "1a7876aa6eff04f96d22ffd9e35492b79df43923e7af57ad10b2e007a570b321"
         autoupdate.strategy = "latest_github_tag"
 
     [resources.system_user]

scripts/install

@@ -16,9 +16,10 @@ 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"
 
+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"
 
 #=================================================
@@ -35,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
 #=================================================

scripts/upgrade

@@ -9,21 +9,16 @@
 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" ]
+ynh_setup_source --dest_dir="$install_dir"
-then
-	ynh_script_progression --message="Upgrading source files..." --weight=1
 
-	# Download, check integrity, uncompress and patch the source from app.src
+ynh_replace_string --match_string="define('ENVIRONMENT', 'development');" --replace_string="define('ENVIRONMENT', 'production');" --target_file=$install_dir/index.php
-	ynh_setup_source --dest_dir="$install_dir"
-fi
 
 chown -R $app:www-data "$install_dir"