From 95d6b317d1c16f4b86cc08f7c04080e2d50249be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Sun, 3 Dec 2023 16:40:08 +0100
Subject: [PATCH] Remove dependency on rsync, use mv instead

---
 manifest.toml      | 4 ++--
 scripts/_common.sh | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index 1fbd024..cc9b002 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -55,7 +55,7 @@ ram.runtime = "50M"
     [resources.ports]
     websocket.default = 3012
     rocket.default = 8095
-    
+
     [resources.permissions]
     main.url = "/"
     api.url = "/api"
@@ -69,4 +69,4 @@ ram.runtime = "50M"
     admin.show_tile = false
 
     [resources.apt]
-    packages = "libpq5, rsync"
+    packages = "libpq5"
diff --git a/scripts/_common.sh b/scripts/_common.sh
index 77b87bd..ee6bfce 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -15,15 +15,15 @@ _download_vaultwarden_from_docker() {
     # Download, check integrity, uncompress the source of vaultwarden from app.src to his build directory
     docker_arg=""
     # Fixup for armhf
-    if [ $YNH_ARCH == "armhf" ]; then
+    if [ "$YNH_ARCH" == "armhf" ]; then
         docker_arg="--os_arch_variant=linux/arm/v7"
     fi
     ynh_docker_image_extract --dest_dir="$install_dir/build/" --image_spec="$pkg_image:$(ynh_app_upstream_version)" $docker_arg
 
+    # Move files from the extract to the live directory
+    ynh_secure_remove --file="$install_dir/live/"
     mkdir -p "$install_dir/live/"
-
-    mv -f "$install_dir/build/vaultwarden" "$install_dir/live/vaultwarden"
-    rsync -a "$install_dir/build/web-vault/" "$install_dir/live/web-vault/"
+    mv -f "$install_dir/build/"{vaultwarden,web-vault} "$install_dir/live/"
     ynh_secure_remove --file="$install_dir/build"
 
     chmod 750 "$install_dir"