Allow building the ISO from local source and replace dev build binstub with --dev

This commit is contained in:
David Heinemeier Hansson committed 2025-11-11 08:47:04 +01:00
1 parent 5c2d06c5fc
commit 872c8fb03f
3 files changed
+20 -6

No files matched your search

+14 -1
View File
@@ -15,9 +15,17 @@ while [[ $# -gt 0 ]]; do
NO_BOOT_OFFER=1
shift
;;
--local-source)
LOCAL_SOURCE=1
shift
;;
--dev)
OMARCHY_INSTALLER_REF=dev
shift
;;
*)
echo "Unknown option: $1"
echo "Usage: $0 [--no-cache] [--no-boot-offer]"
echo "Usage: $0 [--no-cache] [--no-boot-offer] [--local-source] [--dev]"
exit 1
;;
esac
@@ -49,6 +57,11 @@ DOCKER_ARGS=(
-v "$BUILD_ROOT/configs:/configs:ro"
)
# Use local source of Omarchy from $OMARCHY_PATH instead of git checkout
if [[ -n "${LOCAL_SOURCE-}" ]]; then
DOCKER_ARGS+=(-v "$OMARCHY_PATH:/omarchy:ro")
fi
# Use local pacman cache if you already have one on host to speed up repeat runs
if [ -d "/var/cache/pacman/pkg" ]; then
DOCKER_ARGS+=(-v "/var/cache/pacman/pkg:/var/cache/pacman/pkg")
-3
View File
@@ -1,3 +0,0 @@
#!/bin/bash
OMARCHY_INSTALLER_REF=dev omarchy-iso-make
+6 -2
View File
@@ -30,8 +30,12 @@ rm -rf "$build_cache_dir/airootfs/etc/xdg/reflector"
# Bring in our configs
cp -r /configs/* $build_cache_dir/
# Clone Omarchy itself
git clone -b $OMARCHY_INSTALLER_REF https://github.com/$OMARCHY_INSTALLER_REPO.git "$build_cache_dir/airootfs/root/omarchy"
# Setup Omarchy itself
if [[ -d /omarchy ]]; then
cp -rp /omarchy "$build_cache_dir/airootfs/root/omarchy"
else
git clone -b $OMARCHY_INSTALLER_REF https://github.com/$OMARCHY_INSTALLER_REPO.git "$build_cache_dir/airootfs/root/omarchy"
fi
# Make log uploader available in the ISO too
mkdir -p "$build_cache_dir/airootfs/usr/local/bin/"