From 6ccd71ced43ccfe5ddc4616f34cd32d31c10cc34 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Thu, 3 Feb 2022 23:55:38 +0100 Subject: [PATCH 1/2] Upgrade to 1.17.1~ynh1 --- README.md | 2 +- README_fr.md | 2 +- conf/mysql.src | 7 +++++++ conf/{app.src => sqlite.src} | 2 +- doc/DISCLAIMER.md | 1 + manifest.json | 14 +------------- scripts/install | 4 ++-- scripts/upgrade | 2 +- 8 files changed, 15 insertions(+), 19 deletions(-) create mode 100644 conf/mysql.src rename conf/{app.src => sqlite.src} (91%) diff --git a/README.md b/README.md index 2be2ca0..ea6a051 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ This is the reloaded version of the open source timetracker Kimai. Right now its 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:** 1.13~ynh1 +**Shipped version:** 1.17.1~ynh1 **Demo:** https://www.kimai.org/demo/ diff --git a/README_fr.md b/README_fr.md index 7e239a1..c098402 100644 --- a/README_fr.md +++ b/README_fr.md @@ -16,7 +16,7 @@ This is the reloaded version of the open source timetracker Kimai. Right now its 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 :** 1.13~ynh1 +**Version incluse :** 1.17.1~ynh1 **Démo :** https://www.kimai.org/demo/ diff --git a/conf/mysql.src b/conf/mysql.src new file mode 100644 index 0000000..7d4af67 --- /dev/null +++ b/conf/mysql.src @@ -0,0 +1,7 @@ +SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/1.17.1.tar.gz +SOURCE_SUM=ceff0573591d2e5c70a679301caabe626d8545af5e987443c8155f633babcd0e +SOURCE_SUM_PRG=sha256sum +SOURCE_FORMAT=tar.gz +SOURCE_IN_SUBDIR=true +SOURCE_FILENAME= +SOURCE_EXTRACT=true diff --git a/conf/app.src b/conf/sqlite.src similarity index 91% rename from conf/app.src rename to conf/sqlite.src index ebe59ad..c78f915 100644 --- a/conf/app.src +++ b/conf/sqlite.src @@ -4,4 +4,4 @@ SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true SOURCE_FILENAME= -SOURCE_EXTRACT=true +SOURCE_EXTRACT=true \ No newline at end of file diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 1f34d02..a458f2b 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,5 +1,6 @@ * Require dedicated domain like **kimai.domain.tld**. * This app is multi-instance (you can have more then one Kimai instance running on a YunoHost server) +* As sqlite support ended on version 1.14, if you choosed an sqlite databse during installation, Kimai2 upgrade is blocked to version 1.13 #### Multi-user support diff --git a/manifest.json b/manifest.json index 6919ef4..ee19fb3 100644 --- a/manifest.json +++ b/manifest.json @@ -8,7 +8,7 @@ "de": "Eine web-basierte Mehrbenutzer-Zeiterfassung mit Rechnungsdruck mit Unterstützung für mobile Endgeräte", "cs": "Víceuživatelská webová aplikace pro sledování času s podporou mobilních zařízení" }, - "version": "1.13~ynh1", + "version": "1.17.1~ynh1", "url": "https://www.kimai.org", "upstream": { "license": "MIT", @@ -53,18 +53,6 @@ }, "default": false }, - { - "name": "database", - "type": "string", - "ask": { - "en": "Choose the database to use (for production usage choose: mysql)", - "fr": "Choisissez le type de base de données à utiliser (mysql pour un usage en production)", - "de": "Wählen Sie die zu nutzende Datenbank (für produktive Zwecke wähle: mysql)", - "cs": "Zvolte databázi (pro produkční použití vyberte: mysql)" - }, - "choices": ["mysql","sqlite"], - "default": "mysql" - }, { "name": "registration", "type": "boolean", diff --git a/scripts/install b/scripts/install index 04438c6..5b33202 100755 --- a/scripts/install +++ b/scripts/install @@ -28,7 +28,7 @@ path_url="/" admin=$YNH_APP_ARG_ADMIN is_public=$YNH_APP_ARG_IS_PUBLIC registration=$YNH_APP_ARG_REGISTRATION -database=$YNH_APP_ARG_DATABASE +database="mysql" random_key=$(ynh_string_random 32) app=$YNH_APP_INSTANCE_NAME @@ -92,7 +92,7 @@ ynh_script_progression --message="Setting up source files..." ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" +ynh_setup_source --dest_dir="$final_path" --source_id="$database" chmod 750 "$final_path" chmod -R o-rwx "$final_path" diff --git a/scripts/upgrade b/scripts/upgrade index 8bed902..9205484 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -111,7 +111,7 @@ then ynh_secure_remove --file="$final_path" # Download, check integrity, uncompress and patch the source from app.src - ynh_setup_source --dest_dir="$final_path" + ynh_setup_source --dest_dir="$final_path" --source_id="$database" # Restore config if [ -f $tmpdir/local.yaml ]; then From 81c67fb80ec1a0c17ebd04e39ab327e5b6e57a6d Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Thu, 3 Feb 2022 22:55:43 +0000 Subject: [PATCH 2/2] Auto-update README --- README.md | 1 + README_fr.md | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index ea6a051..07110c3 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic i * Require dedicated domain like **kimai.domain.tld**. * This app is multi-instance (you can have more then one Kimai instance running on a YunoHost server) +* As sqlite support ended on version 1.14, if you choosed an sqlite databse during installation, Kimai2 upgrade is blocked to version 1.13 #### Multi-user support diff --git a/README_fr.md b/README_fr.md index c098402..b873101 100644 --- a/README_fr.md +++ b/README_fr.md @@ -28,6 +28,7 @@ Kimai v2 has nothing in common with its predecessor Kimai v1 besides the basic i * Require dedicated domain like **kimai.domain.tld**. * This app is multi-instance (you can have more then one Kimai instance running on a YunoHost server) +* As sqlite support ended on version 1.14, if you choosed an sqlite databse during installation, Kimai2 upgrade is blocked to version 1.13 #### Multi-user support