From d8fc0ceb44fbafbbaf4a3691d686e2609d6340fc Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 10 Sep 2020 14:53:21 +0200 Subject: archbuild: allow empty setarch to skip running setarch at all --- src/archbuild.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/archbuild.in b/src/archbuild.in index fcb0dd5..a569393 100644 --- a/src/archbuild.in +++ b/src/archbuild.in @@ -23,6 +23,7 @@ else fi if [[ -f "@pkgdatadir@/setarch-aliases.d/${arch}" ]]; then read -r set_arch < "@pkgdatadir@/setarch-aliases.d/${arch}" + [ -z "${set_arch}" ] && unset set_arch else set_arch="${arch}" fi @@ -92,7 +93,7 @@ if ${clean_first} || [[ ! -d "${chroots}/${repo}-${arch}" ]]; then rm -rf --one-file-system "${chroots}/${repo}-${arch}" (umask 0022; mkdir -p "${chroots}/${repo}-${arch}") - setarch "${set_arch}" mkarchroot \ + ${set_arch:+setarch "${set_arch}"} mkarchroot \ -C "${pacman_config}" \ -M "${makepkg_config}" \ ${cache_dir} \ -- cgit v1.2.3-54-g00ecf