diff --git a/README.md b/README.md index 2b2ce95..5c39c2b 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ See the ISO link on [omarchy.org](https://omarchy.org). ## Creating the ISO -Run `./bin/omarchy-iso-make`; output goes into `./release`. +Run `./bin/omarchy-iso-make`; output goes into `./release`. By default the ISO uses the Omarchy packages and tracks the `quattro` branch, from the stable mirror. Pass `--edge` to use `omarchy-dev` and `omarchy-settings-dev` from the edge mirror. For local development, build the ISO from sibling checkouts: @@ -18,7 +18,7 @@ For local development, build the ISO from sibling checkouts: Despite the local folder name, the first argument is the Omarchy source checkout (runtime commands, configs, setup scripts, themes, shell, migrations). The installer itself lives in this ISO repo. -Use `--dev` or `--rc` to build against those package channels. +Use `--dev` or `--rc` to build against those package channels. Both `--dev` and `--edge` select the dev packages from the edge mirror. ## Testing the ISO diff --git a/bin/omarchy-iso-make b/bin/omarchy-iso-make index 7b785d0..7e1e7a6 100755 --- a/bin/omarchy-iso-make +++ b/bin/omarchy-iso-make @@ -19,6 +19,11 @@ while [[ $# -gt 0 ]]; do OMARCHY_INSTALL_DEBUG=1 shift ;; + --edge) + OMARCHY_ISO_REF=edge + OMARCHY_MIRROR=edge + shift + ;; --local-source) LOCAL_OMARCHY_PATH="${2:-}" LOCAL_PKGS_PATH="${3:-}" @@ -42,7 +47,7 @@ while [[ $# -gt 0 ]]; do ;; *) echo "Unknown option: $1" - echo "Usage: $0 [--no-cache] [--no-boot-offer] [--debug] [--dev|--rc] [--local-source ]" + echo "Usage: $0 [--no-cache] [--no-boot-offer] [--debug] [--edge] [--dev|--rc] [--local-source ]" exit 1 ;; esac @@ -98,7 +103,7 @@ BUILD_ROOT=$(realpath "${BASH_SOURCE[0]%/*}/..") BUILD_RELEASE_PATH="$BUILD_ROOT/release" mkdir -p "$BUILD_RELEASE_PATH" -OMARCHY_ISO_REF="${OMARCHY_ISO_REF:-stable}" +OMARCHY_ISO_REF="${OMARCHY_ISO_REF:-quattro}" OMARCHY_MIRROR="${OMARCHY_MIRROR:-stable}" DOCKER_ARGS=( diff --git a/bin/omarchy-iso-release b/bin/omarchy-iso-release index ce4482f..cf5eb99 100755 --- a/bin/omarchy-iso-release +++ b/bin/omarchy-iso-release @@ -1,7 +1,7 @@ #!/bin/bash MAKE_ARGS=() -ISO_REF=stable +ISO_REF=quattro RELEASE_SUFFIX="" while [[ $# -gt 0 ]]; do diff --git a/builder/build-iso.sh b/builder/build-iso.sh index a3c8a7b..6206316 100755 --- a/builder/build-iso.sh +++ b/builder/build-iso.sh @@ -2,15 +2,15 @@ set -e -OMARCHY_ISO_REF="${OMARCHY_ISO_REF:-stable}" +OMARCHY_ISO_REF="${OMARCHY_ISO_REF:-quattro}" OMARCHY_MIRROR="${OMARCHY_MIRROR:-stable}" -# Stable ISOs install the stable package names. Dev/local-source ISOs install -# the dev packages explicitly rather than relying on pacman's provides=omarchy -# resolution, so the offline mirror and target install show the real package -# names being tested. +# Quattro, edge, dev, and local-source ISOs install the dev packages explicitly. +# Those package recipes track the quattro branch. This avoids relying on +# pacman's provides=omarchy resolution and shows the real package names being +# tested in the offline mirror and target install. case "$OMARCHY_ISO_REF" in - dev|local) + quattro|edge|dev|local) : "${OMARCHY_RUNTIME_PACKAGE:=omarchy-dev}" : "${OMARCHY_SETTINGS_PACKAGE:=omarchy-settings-dev}" ;;