From 01155ad48fe3eb3e158f8952d02efa3833d9e5ee Mon Sep 17 00:00:00 2001
From: CodeShakingSheep <19874562+CodeShakingSheep@users.noreply.github.com>
Date: Sun, 11 Aug 2024 01:52:59 -0500
Subject: [PATCH] Keep logs and plugins (#114)

* Update upgrade

Update files to keep during upgrade

* Update manifest.toml

Update APT sources
---
 manifest.toml   | 4 ++--
 scripts/upgrade | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 4fb9237..04e3ece 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -84,12 +84,12 @@ ram.runtime = "80M"
         "php8.3-json",
         "php8.3-mbstring",
         "php8.3-pdo",
-        "php8.3-zip",
+        "php8.3-tokenizer",
         "php8.3-xml",
+        "php8.3-zip",
         "php8.3-xsl",
         "php8.3-ldap",
         "php8.3-mysql",
-        "php8.3-sqlite3",
         "mariadb-server",
     ]
 
diff --git a/scripts/upgrade b/scripts/upgrade
index 98fa655..a90a198 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -28,12 +28,11 @@ if ynh_compare_current_package_version --comparison le --version 1.30.0~ynh1; th
     ynh_script_progression --message="Doing a hard cache flush for major Kimai 2 update from version 1.x to 2.x"
 
     # Download, check integrity, uncompress and patch the source from app.src
-    # Remove local.yaml as recommended for major version upgrade https://github.com/kimai/kimai/blob/main/UPGRADING.md
-    # As a full_replace (see https://www.kimai.org/documentation/updates.html) is performed keep .env file
-    ynh_setup_source --dest_dir="$install_dir" --keep=".env var/invoices/ var/data/" --full_replace=1
+    # Remove var/cache/* and var/plugins/* as recommended for major version upgrade https://github.com/kimai/kimai/blob/main/UPGRADING.md
+    ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env var/data/ var/invoices/ var/log/"
 else
     # Download, check integrity, uncompress and patch the source from app.src
-    ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep="config/packages/local.yaml var/invoices/ var/data/"
+    ynh_setup_source --dest_dir="$install_dir" --full_replace=1 --keep=".env var/cache/ var/data/ var/invoices/ var/log/ var/plugins/ "
 fi
 
 chmod 750 "$install_dir"