From 9e4ac63f467416bb262140126b7a2c33f1f338b9 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Fri, 30 Sep 2022 15:54:22 +0200 Subject: [PATCH] don't abort on cachedir on different architecture --- usr/bin/archboot-aarch64-create-repository.sh | 2 +- usr/bin/archboot-riscv64-create-repository.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/usr/bin/archboot-aarch64-create-repository.sh b/usr/bin/archboot-aarch64-create-repository.sh index 6980775ae..e39a1b365 100755 --- a/usr/bin/archboot-aarch64-create-repository.sh +++ b/usr/bin/archboot-aarch64-create-repository.sh @@ -9,9 +9,9 @@ _REPODIR="$(mktemp -d "${1}"/repository.XXX)" _CACHEDIR="${_REPODIR}/var/cache/pacman/pkg" [[ -z "${1}" ]] && _usage _root_check -_cachedir_check echo "Starting repository creation ..." if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then + _cachedir_check _create_pacman_conf "${_REPODIR}" _prepare_pacman "${_REPODIR}" || exit 1 _download_packages "${_REPODIR}" || exit 1 diff --git a/usr/bin/archboot-riscv64-create-repository.sh b/usr/bin/archboot-riscv64-create-repository.sh index bf4199b3e..d7474eb88 100755 --- a/usr/bin/archboot-riscv64-create-repository.sh +++ b/usr/bin/archboot-riscv64-create-repository.sh @@ -9,9 +9,9 @@ _REPODIR="$(mktemp -d "${1}"/repository.XXX)" _CACHEDIR="${_REPODIR}/var/cache/pacman/pkg" [[ -z "${1}" ]] && _usage _root_check -_cachedir_check echo "Starting repository creation ..." if [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then + _cachedir_check _create_pacman_conf "${_REPODIR}" _prepare_pacman "${_REPODIR}" || exit 1 _download_packages "${_REPODIR}" || exit 1