Allow .iso creation from local omarchy code

Author: c10r

README.md

@@ -22,6 +22,11 @@ Example usage:
 OMARCHY_INSTALLER_REPO="myuser/omarchy-fork" OMARCHY_INSTALLER_REF="some-feature" ./bin/omarchy-iso-make
 ```
 
+Alternatively, you can create a .iso with local code instead of pulling down a Github repository:
+```bash
+./bin/omarchy-iso-make --local-omarchy path/to/your/local/clone
+```
+
 ## Testing the ISO
 
 Run `./bin/omarchy-iso-boot [release/omarchy.iso]`.

bin/omarchy-iso-make

@@ -5,6 +5,7 @@ set -e
 
 # Parse command line arguments
 NO_CACHE=""
+LOCAL_OMARCHY_PATH=""
 while [[ $# -gt 0 ]]; do
   case $1 in
   --no-cache)
@@ -15,9 +16,13 @@ while [[ $# -gt 0 ]]; do
     NO_BOOT_OFFER=1
     shift
     ;;
+  --local-omarchy)
+    LOCAL_OMARCHY_PATH="$2"
+    shift 2
+    ;;
   *)
     echo "Unknown option: $1"
-    echo "Usage: $0 [--no-cache] [--no-boot-offer]"
+    echo "Usage: $0 [--no-cache] [--no-boot-offer] [--local-omarchy PATH]"
     exit 1
     ;;
   esac
@@ -47,6 +52,16 @@ DOCKER_ARGS=(
   -v "$BUILD_ROOT/configs:/configs:ro"
 )
 
+# Mount local omarchy directory if provided
+if [[ -n "$LOCAL_OMARCHY_PATH" ]]; then
+  if [[ ! -d "$LOCAL_OMARCHY_PATH" ]]; then
+    echo "Error: Local omarchy path '$LOCAL_OMARCHY_PATH' does not exist"
+    exit 1
+  fi
+  DOCKER_ARGS+=(-v "$(realpath "$LOCAL_OMARCHY_PATH"):/local-omarchy:ro")
+  DOCKER_ARGS+=(-e "USE_LOCAL_OMARCHY=1")
+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")

builder/build-iso.sh

@@ -25,8 +25,14 @@ 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"
+# Clone or copy Omarchy itself
+if [[ "$USE_LOCAL_OMARCHY" == "1" ]]; then
+  echo "Using local omarchy from /local-omarchy"
+  cp -r /local-omarchy "$build_cache_dir/airootfs/root/omarchy"
+else
+  echo "Cloning omarchy from https://github.com/$OMARCHY_INSTALLER_REPO.git (ref: $OMARCHY_INSTALLER_REF)"
+  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/"