From 2c20d67d51c3b154887c35e0c5f542b04f3f634f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Fri, 3 May 2024 16:06:22 +0200
Subject: [PATCH] Rename backup-with-$app to backup-with-borg now that it's in
 install_dir

---
 conf/sudoer          | 2 +-
 conf/systemd.service | 2 +-
 scripts/install      | 6 +++---
 scripts/upgrade      | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/conf/sudoer b/conf/sudoer
index fec3569..b6e756a 100644
--- a/conf/sudoer
+++ b/conf/sudoer
@@ -1 +1 @@
-__APP__ ALL=(root) NOPASSWD: __INSTALL_DIR__/backup-with-__APP__, __INSTALL_DIR__/venv/bin/borg, /usr/bin/yunohost backup create *, /usr/bin/yunohost app setting *, /bin/ls, /usr/bin/test
+__APP__ ALL=(root) NOPASSWD: __INSTALL_DIR__/backup-with-borg, __INSTALL_DIR__/venv/bin/borg, /usr/bin/yunohost backup create *, /usr/bin/yunohost app setting *, /bin/ls, /usr/bin/test
diff --git a/conf/systemd.service b/conf/systemd.service
index 87c332f..636ca96 100644
--- a/conf/systemd.service
+++ b/conf/systemd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/bin/sudo __INSTALL_DIR__/backup-with-__APP__ __APP__
+ExecStart=/usr/bin/sudo __INSTALL_DIR__/backup-with-borg __APP__
 User=__APP__
 Group=__APP__
 
diff --git a/scripts/install b/scripts/install
index bf707a0..e600c07 100755
--- a/scripts/install
+++ b/scripts/install
@@ -61,9 +61,9 @@ mkdir -p /usr/share/yunohost/backup_method
 ynh_add_config --template="backup_method" --destination="/etc/yunohost/hooks.d/backup_method/05-${app}_app"
 chmod go=--- "/etc/yunohost/hooks.d/backup_method/05-${app}_app"
 
-ynh_add_config --template="backup-with-borg" --destination="$install_dir/backup-with-$app"
-chmod u+x "$install_dir/backup-with-$app"
-chown "$app:$app" "$install_dir/backup-with-$app"
+ynh_add_config --template="backup-with-borg" --destination="$install_dir/backup-with-borg"
+chmod u+x "$install_dir/backup-with-borg"
+chown "$app:$app" "$install_dir/backup-with-borg"
 
 ynh_add_config --template="sudoer" --destination="/etc/sudoers.d/$app"
 chown root:root "/etc/sudoers.d/$app"
diff --git a/scripts/upgrade b/scripts/upgrade
index 174271d..93a6039 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -58,7 +58,7 @@ fi
 if [ -d /opt/borg-env ]; then
     ynh_secure_remove --file="/opt/borg-env"
     ynh_secure_remove --file="/usr/local/bin/borg"
-    ynh_secure_remove --file="/usr/local/bin/backup-with-$app"
+    ynh_secure_remove --file="/usr/local/bin/backup-with-borg"
 fi
 
 #=================================================
@@ -86,9 +86,9 @@ mkdir -p /usr/share/yunohost/backup_method
 ynh_add_config --template="backup_method" --destination="/etc/yunohost/hooks.d/backup_method/05-${app}_app"
 chmod go=--- "/etc/yunohost/hooks.d/backup_method/05-${app}_app"
 
-ynh_add_config --template="backup-with-borg" --destination="$install_dir/backup-with-$app"
-chmod u+x "$install_dir/backup-with-$app"
-chown "$app:$app" "$install_dir/backup-with-$app"
+ynh_add_config --template="backup-with-borg" --destination="$install_dir/backup-with-borg"
+chmod u+x "$install_dir/backup-with-borg"
+chown "$app:$app" "$install_dir/backup-with-borg"
 
 ynh_add_config --template="sudoer" --destination="/etc/sudoers.d/$app"
 chown root:root "/etc/sudoers.d/$app"