From b59c8486f2a7711f03d8c32b093686a250330615 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 14 Jul 2024 11:44:30 +0200
Subject: [PATCH] fix update of scipts

---
 usr/lib/archboot/cpio/hooks/installer | 2 +-
 usr/lib/archboot/update/manage.sh     | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/lib/archboot/cpio/hooks/installer b/usr/lib/archboot/cpio/hooks/installer
index 4adbf2527..9f9d0f7c7 100644
--- a/usr/lib/archboot/cpio/hooks/installer
+++ b/usr/lib/archboot/cpio/hooks/installer
@@ -15,7 +15,7 @@ _run ()
     _file_rename /usr/bin/archboot-copy-mountpoint.sh /usr/bin/copy-mountpoint.sh
     _file_rename /usr/bin/archboot-rsync-backup.sh /usr/bin/rsync-backup.sh
     _file_rename /usr/bin/archboot-restore-usbstick.sh /usr/bin/restore-usbstick.sh
-    _file_rename /usr/bin/archboot-testsuite.sh /usr/bin/testsuite.sh
+    _file_rename /usr/bin/archboot-testsuite.sh /usr/bin/testsuite
     _full_dir /usr/lib/archboot/installer
     _file /etc/archboot/defaults
     _file /usr/share/archboot/grub/archboot-background.png
diff --git a/usr/lib/archboot/update/manage.sh b/usr/lib/archboot/update/manage.sh
index 6ed5e7e58..8028fb4c9 100644
--- a/usr/lib/archboot/update/manage.sh
+++ b/usr/lib/archboot/update/manage.sh
@@ -151,10 +151,14 @@ _download_latest_task() {
     ${_DLPROG} -o "${_ETC}/defaults" "${_SOURCE}${_ETC}/defaults?inline=false"
     # helper binaries
     # main binaries
-    _SCRIPTS="quickinst setup clock launcher localize network pacsetup update copy-mountpoint rsync-backup restore-usbstick testsuite"
+    _SCRIPTS="quickinst setup clock launcher localize network pacsetup update testsuite"
     for i in ${_SCRIPTS}; do
         [[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false"
     done
+    _SCRIPTS="copy-mountpoint rsync-backup restore-usbstick"
+    for i in ${_SCRIPTS}; do
+        [[ -e "${_BIN}/${i}.sh" ]] && ${_DLPROG} -o "${_BIN}/${i}.sh" "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false"
+    done
     _SCRIPTS="binary-check.sh fw-check.sh not-installed.sh secureboot-keys.sh mkkeys.sh hwsim.sh"
     for i in ${_SCRIPTS}; do
         [[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}?inline=false"