From 872c8fb03f4ec8cbe91b5ecfff596f1951829d64 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Tue, 11 Nov 2025 08:47:04 +0100
Subject: [PATCH] Allow building the ISO from local source and replace dev
 build binstub with --dev

---
 bin/omarchy-iso-make     | 15 ++++++++++++++-
 bin/omarchy-iso-make-dev |  3 ---
 builder/build-iso.sh     |  8 ++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)
 delete mode 100755 bin/omarchy-iso-make-dev

diff --git a/bin/omarchy-iso-make b/bin/omarchy-iso-make
index 03fbdfb..50638ed 100755
--- a/bin/omarchy-iso-make
+++ b/bin/omarchy-iso-make
@@ -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")
diff --git a/bin/omarchy-iso-make-dev b/bin/omarchy-iso-make-dev
deleted file mode 100755
index 5121079..0000000
--- a/bin/omarchy-iso-make-dev
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-OMARCHY_INSTALLER_REF=dev omarchy-iso-make
diff --git a/builder/build-iso.sh b/builder/build-iso.sh
index 0310d57..c1d3bab 100755
--- a/builder/build-iso.sh
+++ b/builder/build-iso.sh
@@ -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/"