diff --git a/bin/omarchy-iso-make b/bin/omarchy-iso-make index 2ddb894..3a1391e 100755 --- a/bin/omarchy-iso-make +++ b/bin/omarchy-iso-make @@ -27,9 +27,13 @@ while [[ $# -gt 0 ]]; do OMARCHY_MIRROR=edge shift ;; + --rc) + OMARCHY_MIRROR=rc + shift + ;; *) echo "Unknown option: $1" - echo "Usage: $0 [--no-cache] [--no-boot-offer] [--local-source] [--dev] [--edge]" + echo "Usage: $0 [--no-cache] [--no-boot-offer] [--local-source] [--dev] [--edge] [--rc]" exit 1 ;; esac diff --git a/builder/build-iso.sh b/builder/build-iso.sh index 625b4b3..7d4a59a 100755 --- a/builder/build-iso.sh +++ b/builder/build-iso.sh @@ -9,11 +9,7 @@ pacman --noconfirm -Sy archiso git sudo base-devel jq grub # Install omarchy-keyring for package verification during build # The [omarchy] repo is defined in /configs/pacman-online.conf with SigLevel = Optional TrustAll -if [[ $OMARCHY_MIRROR == "edge" ]]; then - pacman --config /configs/pacman-online-edge.conf --noconfirm -Sy omarchy-keyring -else - pacman --config /configs/pacman-online-stable.conf --noconfirm -Sy omarchy-keyring -fi +pacman --config /configs/pacman-online-${OMARCHY_MIRROR}.conf --noconfirm -Sy omarchy-keyring pacman-key --populate omarchy # Setup build locations @@ -85,11 +81,7 @@ all_packages+=($(grep -v '^#' /builder/archinstall.packages | grep -v '^$')) # Download all the packages to the offline mirror inside the ISO mkdir -p /tmp/offlinedb -if [[ $OMARCHY_MIRROR == "edge" ]]; then - pacman --config /configs/pacman-online-edge.conf --noconfirm -Syw "${all_packages[@]}" --cachedir $offline_mirror_dir/ --dbpath /tmp/offlinedb -else - pacman --config /configs/pacman-online-stable.conf --noconfirm -Syw "${all_packages[@]}" --cachedir $offline_mirror_dir/ --dbpath /tmp/offlinedb -fi +pacman --config /configs/pacman-online-${OMARCHY_MIRROR}.conf --noconfirm -Syw "${all_packages[@]}" --cachedir $offline_mirror_dir/ --dbpath /tmp/offlinedb repo-add --new "$offline_mirror_dir/offline.db.tar.gz" "$offline_mirror_dir/"*.pkg.tar.zst # Create a symlink to the offline mirror instead of duplicating it.