remove archboot- from testsuite

This commit is contained in:
Tobias Powalowski 2024-07-14 11:39:55 +02:00
parent 237527e96c
commit a73a744e27
2 changed files with 4 additions and 3 deletions

View file

@ -6,7 +6,7 @@ _run ()
{ {
_dir /mnt/install _dir /mnt/install
_map _binary genfstab arch-chroot pacstrap \ _map _binary genfstab arch-chroot pacstrap \
archboot-{binary-check.sh,fw-check.sh,not-installed.sh,testsuite.sh} hwdetect archboot-{binary-check.sh,fw-check.sh,not-installed.sh} hwdetect
_file_rename /usr/bin/archboot-setup.sh /usr/bin/setup _file_rename /usr/bin/archboot-setup.sh /usr/bin/setup
_file_rename /usr/bin/archboot-launcher.sh /usr/bin/launcher _file_rename /usr/bin/archboot-launcher.sh /usr/bin/launcher
_file_rename /usr/bin/archboot-quickinst.sh /usr/bin/quickinst _file_rename /usr/bin/archboot-quickinst.sh /usr/bin/quickinst
@ -15,6 +15,7 @@ _run ()
_file_rename /usr/bin/archboot-copy-mountpoint.sh /usr/bin/copy-mountpoint.sh _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-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-restore-usbstick.sh /usr/bin/restore-usbstick.sh
_file_rename /usr/bin/archboot-testsuite.sh /usr/bin/testsuite.sh
_full_dir /usr/lib/archboot/installer _full_dir /usr/lib/archboot/installer
_file /etc/archboot/defaults _file /etc/archboot/defaults
_file /usr/share/archboot/grub/archboot-background.png _file /usr/share/archboot/grub/archboot-background.png

View file

@ -151,11 +151,11 @@ _download_latest_task() {
${_DLPROG} -o "${_ETC}/defaults" "${_SOURCE}${_ETC}/defaults?inline=false" ${_DLPROG} -o "${_ETC}/defaults" "${_SOURCE}${_ETC}/defaults?inline=false"
# helper binaries # helper binaries
# main binaries # main binaries
_SCRIPTS="quickinst setup clock launcher localize network pacsetup update copy-mountpoint rsync-backup restore-usbstick" _SCRIPTS="quickinst setup clock launcher localize network pacsetup update copy-mountpoint rsync-backup restore-usbstick testsuite"
for i in ${_SCRIPTS}; do for i in ${_SCRIPTS}; do
[[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false" [[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}.sh?inline=false"
done done
_SCRIPTS="binary-check.sh fw-check.sh not-installed.sh secureboot-keys.sh testsuite.sh mkkeys.sh hwsim.sh" _SCRIPTS="binary-check.sh fw-check.sh not-installed.sh secureboot-keys.sh mkkeys.sh hwsim.sh"
for i in ${_SCRIPTS}; do for i in ${_SCRIPTS}; do
[[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}?inline=false" [[ -e "${_BIN}/${i}" ]] && ${_DLPROG} -o "${_BIN}/${i}" "${_SOURCE}${_BIN}/archboot-${i}?inline=false"
[[ -e "${_BIN}/archboot-${i}" ]] && ${_DLPROG} -o "${_BIN}/archboot-${i}" "${_SOURCE}${_BIN}/archboot-${i}?inline=false" [[ -e "${_BIN}/archboot-${i}" ]] && ${_DLPROG} -o "${_BIN}/archboot-${i}" "${_SOURCE}${_BIN}/archboot-${i}?inline=false"