Merge pull request #44 from YunoHost-Apps/upgrade

Upgrade to 1.17.1~ynh1

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/
 
@@ -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
 

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/
 
@@ -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
 

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

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

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
 

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",

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"

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