Merge pull request 'Fix auto-install.sh to work standalone, not just baked into the image' (#37) from worktree-gui-wifi-module into main

Reviewed-on: #37
2026-07-22 02:40:03 +00:00
parent a91634c460 f565e9c2a1
commit 33b1d5ec79
5 changed files with 68 additions and 26 deletions
@@ -82,6 +82,12 @@ export PVE1_HOST PVE_TEST_HOST PROXMOX_HOST PROXMOX_SSH_USER PROXMOX_STORAGE \
 : "${NIX_CACHE_HOST:=nix-cache}"
 export NIX_CACHE_HOST

+# Matches variables.nix's lanDomain (the Gitea host this flake's own repo
+# is served from -- see scripts/installer/auto-install.sh's FLAKE_BASE_URL)
+# -- update both if it ever changes.
+: "${LAN_DOMAIN:=gitea.lan.ddnsgeek.com}"
+export LAN_DOMAIN
+
 # nix_extra_opts: call as a plain statement (NOT inside $(...)/<(...) --
 # that forks a subshell, and the whole point is exporting a decision back
 # into *this* shell) to populate the global NIX_OPTS array with whatever
@@ -1,9 +1,12 @@
-#!/run/current-system/sw/bin/bash
+#!/usr/bin/env bash
 set -eux

 set -euo pipefail

-export FLAKE_BASE_URL="git+https://@lanDomain@/beatzaplenty/nixos.git"
+# shellcheck source=../env.sh
+source "$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)/env.sh"
+
+export FLAKE_BASE_URL="git+https://${LAN_DOMAIN}/beatzaplenty/nixos.git"

 echo "Fetching available NixOS hosts from flake..."
 # Two categories deliberately excluded from the menu: