diff --git a/build_images.sh b/build_images.sh index 54aa054..ea08113 100644 --- a/build_images.sh +++ b/build_images.sh @@ -204,14 +204,13 @@ build_or_list_images() { fi fi fi - if [[ "$run_funct" == "gentoo" ]]; then + # 强制设置架构名字 + if [[ "$run_funct" == "gentoo" || "$run_funct" == "debian" || "$run_funct" == "ubuntu" ]]; then [ "${arch}" = "amd64" ] && arch="x86_64" elif [[ "$run_funct" == "fedora" || "$run_funct" == "openeuler" || "$run_funct" == "opensuse" || "$run_funct" == "alpine" || "$run_funct" == "oracle" || "$run_funct" == "archlinux" ]]; then [ "${arch}" = "aarch64" ] && arch="arm64" elif [[ "$run_funct" == "almalinux" || "$run_funct" == "centos" || "$run_funct" == "rockylinux" ]]; then [ "${arch}" = "aarch64" ] && arch="arm64" - elif [[ "$run_funct" == "debian" || "$run_funct" == "ubuntu" ]]; then - [ "${arch}" = "amd64" ] && arch="x86_64" fi ls if [ -f rootfs.tar.xz ]; then @@ -220,9 +219,10 @@ build_or_list_images() { fi ls else + # 强制设置架构名字 if [[ "$run_funct" == "gentoo" || "$run_funct" == "debian" || "$run_funct" == "ubuntu" ]]; then [ "${arch}" = "amd64" ] && arch="x86_64" - elif [[ "$run_funct" == "fedora" || "$run_funct" == "openeuler" || "$run_funct" == "opensuse" ]]; then + elif [[ "$run_funct" == "fedora" || "$run_funct" == "openeuler" || "$run_funct" == "opensuse" || "$run_funct" == "alpine" || "$run_funct" == "oracle" || "$run_funct" == "archlinux" ]]; then [ "${arch}" = "aarch64" ] && arch="arm64" elif [[ "$run_funct" == "almalinux" || "$run_funct" == "centos" || "$run_funct" == "rockylinux" ]]; then [ "${arch}" = "aarch64" ] && arch="arm64"