From c8ad654b06a07c0019e94c401737afd154703286 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Mon, 1 May 2023 09:59:58 +0200 Subject: [PATCH] remove "" --- usr/lib/archboot/container.sh | 4 ++-- usr/lib/archboot/release.sh | 2 +- usr/lib/archboot/repository.sh | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/usr/lib/archboot/container.sh b/usr/lib/archboot/container.sh index 8f5c4dfa9..583cd299b 100644 --- a/usr/lib/archboot/container.sh +++ b/usr/lib/archboot/container.sh @@ -30,11 +30,11 @@ _parameters() { _clean_cache() { if [[ "${_CLEANUP_CACHE}" == "1" ]]; then echo "Cleaning pacman cache in ${1}..." - rm -r "${1}""${_CACHEDIR}" + rm -r "${1}${_CACHEDIR}" fi if grep -qw 'archboot' /etc/hostname; then echo "Cleaning archboot ${_CACHEDIR}..." - for i in "${1}""${_CACHEDIR}"/*; do + for i in "${1}${_CACHEDIR}"/*; do [[ "${i}" == "${1}${_CACHEDIR}/archboot.db" ]] || rm -f "${_CACHEDIR}"/"$(basename "${i}")" done fi diff --git a/usr/lib/archboot/release.sh b/usr/lib/archboot/release.sh index f4b80d5a7..621c91a71 100644 --- a/usr/lib/archboot/release.sh +++ b/usr/lib/archboot/release.sh @@ -34,7 +34,7 @@ _create_iso() { cd "${1}" || exit 1 # create container archboot-"${_ARCH}"-create-container.sh "${_W_DIR}" -cc --install-source="${2}" || exit 1 - _create_archboot_db "${_W_DIR}""${_CACHEDIR}" + _create_archboot_db "${_W_DIR}${_CACHEDIR}" # riscv64 does not support kexec at the moment if ! [[ "${_ARCH}" == "riscv64" ]]; then # generate tarball in container, umount tmp container tmpfs, else weird things could happen diff --git a/usr/lib/archboot/repository.sh b/usr/lib/archboot/repository.sh index 58f57443d..7c5fad7d9 100644 --- a/usr/lib/archboot/repository.sh +++ b/usr/lib/archboot/repository.sh @@ -27,7 +27,7 @@ _download_packages() { _move_packages() { echo "Moving packages to ${2}..." - mv "${1}""${_CACHEDIR}"/./* "${2}" + mv "${1}${_CACHEDIR}"/./* "${2}" } _cleanup_repodir() {