From 9be5a18c2e7a276a6b54f4c5b415360cc4194cbf Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Thu, 2 May 2024 10:27:34 +0200
Subject: [PATCH] evobackup-client: upstream release 24.05

---
 CHANGELOG.md                                   |  2 ++
 evobackup-client/files/upstream/CHANGELOG.md   | 18 ++++++++++++++----
 .../files/upstream/bin/evobackupctl            | 11 +++++++----
 evobackup-client/files/upstream/lib/main.sh    |  2 +-
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6207755f..854ffa94 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ The **patch** part is incremented if multiple releases happen the same month
 
 ### Changed
 
+* evobackup-client: upstream release 24.05
+
 ### Fixed
 
 ### Removed
diff --git a/evobackup-client/files/upstream/CHANGELOG.md b/evobackup-client/files/upstream/CHANGELOG.md
index 9d5c1681..a62b459f 100644
--- a/evobackup-client/files/upstream/CHANGELOG.md
+++ b/evobackup-client/files/upstream/CHANGELOG.md
@@ -23,13 +23,23 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 ### Security
 
-## [24.04.1]
+## [24.05] - 2022-05-02
+
+### Added
+
+* evobackupctl: update LIBDIR when copying the template
+
+### Changed
+
+* evobackupctl: simplify the program path retrieval
+
+## [24.04.1] - 2022-04-30
 
 ### Fixed
 
 * evobackupctl: quote ARGS variable for options parsing.
 
-## [24.04]
+## [24.04] - 2022-04-29
 
 ### Added
 
@@ -52,7 +62,7 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 * don't exit the whole program if a sync task can't be done
 
-## [22.12]
+## [22.12] - 2022-12-27
 
 ### Changed
 
@@ -77,6 +87,6 @@ The **patch** part changes is incremented if multiple releases happen the same m
 
 * Make start_time and stop_time compatible with OpenBSD
 
-## [22.03]
+## [22.03] - 2022-04-03
 
 Split client and server parts of the project
diff --git a/evobackup-client/files/upstream/bin/evobackupctl b/evobackup-client/files/upstream/bin/evobackupctl
index 33996945..02adacb2 100644
--- a/evobackup-client/files/upstream/bin/evobackupctl
+++ b/evobackup-client/files/upstream/bin/evobackupctl
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 
 # shellcheck disable=SC2155
-readonly PROGNAME=$(basename "${0}")
-# shellcheck disable=SC2155
-readonly PROGDIR=$(readlink -m "$(dirname "${0}")")
+readonly PROGPATH=$(readlink -m "${0}")
+readonly PROGNAME=$(basename "${PROGPATH}")
 # shellcheck disable=SC2124
 readonly ARGS=$@
 
@@ -78,10 +77,14 @@ copy_template() {
         if cp "${LIBDIR}/zzz_evobackup.sh" "${dest_path}"; then
             chmod 750 "${dest_path}"
 
-            sed -i "s|@COMMAND@|${PROGDIR}/${PROGNAME} ${ARGS}|" "${dest_path}"
+            # Insert metadata about the template
+            sed -i "s|@COMMAND@|${PROGPATH} ${ARGS}|" "${dest_path}"
             sed -i "s|@DATE@|$(date --iso-8601=seconds)|" "${dest_path}"
             sed -i "s|@VERSION@|${VERSION}|" "${dest_path}"
 
+            # Make sure that the library directory is correct
+            sed -i "s|^LIBDIR=.\+|LIBDIR=\"${LIBDIR}\"|" "${dest_path}"
+
             printf "New evobackup script has been saved to '%s'.\n" "${dest_path}"
             printf "Remember to customize it (mail notifications, backup servers…).\n"
             exit 0
diff --git a/evobackup-client/files/upstream/lib/main.sh b/evobackup-client/files/upstream/lib/main.sh
index d4873cb9..f8e29fa0 100644
--- a/evobackup-client/files/upstream/lib/main.sh
+++ b/evobackup-client/files/upstream/lib/main.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2034,SC2317
 
-readonly VERSION="24.04.1"
+readonly VERSION="24.05"
 
 # set all programs to C language (english)
 export LC_ALL=C