From be6ebdf415af3fe196950d5d6447ee78e5d8adcb Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Thu, 2 May 2024 10:17:22 +0200 Subject: [PATCH] evobackupctl: simplify the program path retrieval --- client/CHANGELOG.md | 2 ++ client/bin/evobackupctl | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/client/CHANGELOG.md b/client/CHANGELOG.md index 9d5c168..61e33ca 100644 --- a/client/CHANGELOG.md +++ b/client/CHANGELOG.md @@ -15,6 +15,8 @@ The **patch** part changes is incremented if multiple releases happen the same m ### Changed +* evobackupctl: simplify the program path retrieval + ### Deprecated ### Removed diff --git a/client/bin/evobackupctl b/client/bin/evobackupctl index 3399694..44faba6 100644 --- a/client/bin/evobackupctl +++ b/client/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,7 +77,8 @@ 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}"