From 36dd96a3efaafe958ec27cf6bb19904353b02e5f Mon Sep 17 00:00:00 2001 From: eric_G <46165813+ericgaspar@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:35:48 +0200 Subject: [PATCH] Testing (#111) * Upgrade to v2.19.1 (#109) * Upgrade sources - `main` v2.19.1: https://github.com/kevinpapst/kimai2/releases/tag/2.19.1 * Auto-update READMEs * Update manifest.toml (#107) Upgrade php to v8.3 * Update manifest.toml * Auto-update READMEs * Update backup * cleaning --------- Co-authored-by: YunoHost Bot Co-authored-by: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com> Co-authored-by: yunohost-bot --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_id.md | 2 +- README_zh_Hans.md | 2 +- manifest.toml | 24 ++++++++++++------------ scripts/backup | 6 ++---- scripts/install | 3 --- scripts/restore | 7 +++---- scripts/upgrade | 9 --------- 12 files changed, 24 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index b0ad464..3c2431e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ It shall NOT be edited by hand. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Shipped version:** 2.19.1~ynh1 +**Shipped version:** 2.19.1~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index 30e848b..ffbcbbe 100644 --- a/README_es.md +++ b/README_es.md @@ -19,7 +19,7 @@ No se debe editar a mano. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Versión actual:** 2.19.1~ynh1 +**Versión actual:** 2.19.1~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 9c0ac87..cae1857 100644 --- a/README_eu.md +++ b/README_eu.md @@ -19,7 +19,7 @@ EZ editatu eskuz. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Paketatutako bertsioa:** 2.19.1~ynh1 +**Paketatutako bertsioa:** 2.19.1~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 07909e2..7f4d083 100644 --- a/README_fr.md +++ b/README_fr.md @@ -19,7 +19,7 @@ Il NE doit PAS être modifié à la main. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Version incluse :** 2.19.1~ynh1 +**Version incluse :** 2.19.1~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index 1136125..13069bf 100644 --- a/README_gl.md +++ b/README_gl.md @@ -19,7 +19,7 @@ NON debe editarse manualmente. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Versión proporcionada:** 2.19.1~ynh1 +**Versión proporcionada:** 2.19.1~ynh2 **Demo:** diff --git a/README_id.md b/README_id.md index 392dda5..3bf1dfe 100644 --- a/README_id.md +++ b/README_id.md @@ -19,7 +19,7 @@ Ini TIDAK boleh diedit dengan tangan. Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**Versi terkirim:** 2.19.1~ynh1 +**Versi terkirim:** 2.19.1~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 58b5993..58addb0 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -19,7 +19,7 @@ Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic ideas of time-tracking and the current development team. It is based on a lot of great frameworks. Special thanks to Symfony v4, Doctrine, AdminThemeBundle (based on AdminLTE). -**分发版本：** 2.19.1~ynh1 +**分发版本：** 2.19.1~ynh2 **演示：** diff --git a/manifest.toml b/manifest.toml index 8a4fc9c..d6cf16a 100644 --- a/manifest.toml +++ b/manifest.toml @@ -9,7 +9,7 @@ description.fr = "Application multi-utilisateurs de suivi du temps compatible av description.de = "Eine web-basierte Mehrbenutzer-Zeiterfassung mit Rechnungsdruck mit Unterstützung für mobile Endgeräte" description.cs = "Víceuživatelská webová aplikace pro sledování času s podporou mobilních zařízení" -version = "2.19.1~ynh1" +version = "2.19.1~ynh2" maintainers = [] @@ -77,17 +77,17 @@ ram.runtime = "80M" [resources.apt] packages = [ - "php8.2-gd", - "php8.2-intl", - "php8.2-json", - "php8.2-mbstring", - "php8.2-pdo", - "php8.2-zip", - "php8.2-xml", - "php8.2-xsl", - "php8.2-ldap", - "php8.2-mysql", - "php8.2-sqlite3", + "php8.3-gd", + "php8.3-intl", + "php8.3-json", + "php8.3-mbstring", + "php8.3-pdo", + "php8.3-zip", + "php8.3-xml", + "php8.3-xsl", + "php8.3-ldap", + "php8.3-mysql", + "php8.3-sqlite3", "mariadb-server", ] diff --git a/scripts/backup b/scripts/backup index c900e22..30f2c81 100755 --- a/scripts/backup +++ b/scripts/backup @@ -32,11 +32,9 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf" #================================================= # BACKUP THE MYSQL DATABASE #================================================= +ynh_print_info --message="Backing up the MySQL database..." -if [ "$database" = "mysql" ]; then - ynh_print_info --message="Backing up the MySQL database..." - ynh_mysql_dump_db --database="$db_name" > db.sql -fi +ynh_mysql_dump_db --database="$db_name" > db.sql #================================================= # END OF SCRIPT diff --git a/scripts/install b/scripts/install index d830cb7..4dc5cd0 100755 --- a/scripts/install +++ b/scripts/install @@ -13,9 +13,6 @@ source /usr/share/yunohost/helpers # INITIALIZE AND STORE SETTINGS #================================================= -database="mysql" -ynh_app_setting_set --app="$app" --key=database --value="$database" - random_key=$(ynh_string_random --length=32) ynh_app_setting_set --app="$app" --key=random_key --value="$random_key" diff --git a/scripts/restore b/scripts/restore index ff226f6..7dfd110 100755 --- a/scripts/restore +++ b/scripts/restore @@ -27,10 +27,9 @@ setfacl -R -m g:"www-data":rwX -m u:"$app":rwX "$install_dir/var/" #================================================= # RESTORE THE MYSQL DATABASE #================================================= -if [ "$database" = "mysql" ]; then - ynh_script_progression --message="Restoring the MySQL database..." --weight=1 - ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql -fi +ynh_script_progression --message="Restoring the MySQL database..." --weight=1 + +ynh_mysql_connect_as --user="$db_user" --password="$db_pwd" --database="$db_name" < ./db.sql #================================================= # RESTORE SYSTEM CONFIGURATIONS diff --git a/scripts/upgrade b/scripts/upgrade index 8d41640..98fa655 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -14,15 +14,6 @@ source /usr/share/yunohost/helpers #================================================= ynh_script_progression --message="Ensuring downward compatibility..." --weight=1 -if [ "$database" == "sqlite" ]; then - ynh_script_progression --message="Sqlite is not supported by Kimai2 anymore..." - ynh_script_progression --message="Kimai2 will be upgraded to last available version : 1.13" - if ynh_compare_current_package_version --comparison ge --version 1.17.1~ynh1; then - ynh_script_progression --message="Kimai2 sqlite version is already to the last available version, no upgrade will be made" - ynh_die --message="" 0 - fi -fi - if [ -z "${registration:-}" ]; then registration=0 ynh_app_setting_set --app="$app" --key=registration --value="$registration"