From 9185ed91ec4541e6c29190d6da81bfda82aac91f Mon Sep 17 00:00:00 2001
From: Chris Vogel <github@z9.de>
Date: Tue, 18 Jun 2024 14:28:35 +0200
Subject: [PATCH] get rid of multiple building of paths

---
 scripts/_common.sh | 24 +++++++++++++-----------
 scripts/backup     |  2 +-
 scripts/restore    |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index a9408e7..147181b 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -25,6 +25,8 @@ flohmarkt_install="$install_dir"
 flohmarkt_sym_install="$( dirname $flohmarkt_install )/$flohmarkt_filename"
 flohmarkt_venv_dir="${flohmarkt_install}/venv"
 flohmarkt_app_dir="${flohmarkt_install}/app"
+flohmarkt_cron_job="/etc/cron.hourly/${app}"
+flohmarkt_urlwatch_dir="${flohmarkt_install}/urlwatch"
 # directory containing logfiles
 flohmarkt_log_dir="/var/log/${app}"
 flohmarkt_sym_log_dir="/var/log/${flohmarkt_filename}"
@@ -770,24 +772,24 @@ flohmarkt_ynh_venv_requirements() {
 }
 
 flohmarkt_ynh_urlwatch_cron() {
-    mkdir -m 750 -p "${flohmarkt_install}/urlwatch"
-    chown ${app}:root "${flohmarkt_install}/urlwatch"
+    mkdir -m 750 -p "${flohmarkt_urlwatch_dir}"
+    chown ${app}:root "${flohmarkt_urlwatch_dir}"
     ynh_add_config --template="../conf/urlwatch_config.yaml" \
-        --destination="${flohmarkt_install}/urlwatch/config.yaml"
+        --destination="${flohmarkt_urlwatch_dir}/config.yaml"
     ynh_add_config --template="../conf/urlwatch_urls.yaml" \
-        --destination="${flohmarkt_install}/urlwatch/urls.yaml"
+        --destination="${flohmarkt_urlwatch_dir}/urls.yaml"
     ynh_add_config --template="../conf/urlwatch.cron" \
-        --destination="/etc/cron.hourly/${app}"
-    chown root:root "/etc/cron.hourly/${app}"
-    chmod 755 "/etc/cron.hourly/${app}"
+        --destination="${flohmarkt_cron_job}"
+    chown root:root "${flohmarkt_cron_job}"
+    chmod 755 "${flohmarkt_cron_job}"
     # run urlwatch once to initialize if cache file does not exist, 
     # but if sending email fails (like on CI) just warn. We do not want
     # to show the output that might contain passwords
-    if ! [[ -s /var/www/${app}/urlwatch/cache.file ]] &&
+    if ! [[ -s ${flohmarkt_urlwatch_dir}/cache.file ]] &&
         ! ynh_exec_fully_quiet sudo -u ${app} urlwatch \
-        --config=/var/www/${app}/urlwatch/config.yaml \
-        --urls=/var/www/${app}/urlwatch/urls.yaml \
-        --cache=/var/www/${app}/urlwatch/cache.file 
+        --config=${flohmarkt_urlwatch_dir}/config.yaml \
+        --urls=${flohmarkt_urlwatch_dir}/urls.yaml \
+        --cache=${flohmarkt_urlwatch_dir}/cache.file 
     then
         ynh_print_warn --message="initial call to urlwatch failed"
     fi
diff --git a/scripts/backup b/scripts/backup
index 04aaf99..febc069 100755
--- a/scripts/backup
+++ b/scripts/backup
@@ -11,7 +11,7 @@ ynh_backup --src_path="/etc/fail2ban/filter.d/$app.conf"
 ynh_backup --src_path="/etc/logrotate.d/$app"
 ynh_backup --src_path="/opt/couchdb/etc/local.d/05-flohmarkt.ini"
 ynh_backup --src_path="/etc/systemd/system/$flohmarkt_filename.service"
-ynh_backup --src_path="/etc/cron.hourly/$flohmarkt_filename"
+ynh_backup --src_path="${flohmarkt_cron_job}"
 ynh_backup --src_path="${flohmarkt_log_dir}"
 
 # for the following backups we'll want to stop flohmarkt and couchdb
diff --git a/scripts/restore b/scripts/restore
index bb7f855..efd7608 100755
--- a/scripts/restore
+++ b/scripts/restore
@@ -86,6 +86,6 @@ flohmarkt_ynh_create_symlinks
 
 # restore cronjob file for urlwatch
 ynh_script_progression --message="Restoring cronjob for urlwatch..." --weight=1
-ynh_restore_file --origin_path="/etc/cron.hourly/$flohmarkt_filename"
+ynh_restore_file --origin_path="${flohmarkt_cron_job}"
 
 ynh_script_progression --message="Restoration completed for $app" --last