From c4fa9e4138d3fdc167229fc6a5234e7c487060ce Mon Sep 17 00:00:00 2001
From: Paul Dino Jones <paul@spacefreak18.xyz>
Date: Mon, 22 Jun 2026 13:09:50 -0400
Subject: [PATCH] custom nspawn script for arch build

---
 .github/actions/archpkgbuild/action.yml | 21 ---------------------
 .github/bin/systemd-nspawn              | 18 ++++++++++++++++++
 .github/workflows/ci.yaml               |  1 +
 3 files changed, 19 insertions(+), 21 deletions(-)
 delete mode 100644 .github/actions/archpkgbuild/action.yml
 create mode 100644 .github/bin/systemd-nspawn

diff --git a/.github/actions/archpkgbuild/action.yml b/.github/actions/archpkgbuild/action.yml
deleted file mode 100644
index 3eefba1..0000000
--- a/.github/actions/archpkgbuild/action.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-name: build-arch-package
-description: Build an Arch Linux package
-inputs:
-  PKGBUILD:
-    description: PKGBUILD path
-    required: true
-  OUTDIR:
-    description: Output directory to store the built package (relative to $HOME)
-    required: false
-    default: $HOME/arch-packages
-  BUILD_SCRIPT:
-    description: Pacman configuration file used
-    required: false
-    default: extra-x86_64-build
-branding:
-  color: blue
-  icon: archive
-runs:
-  using: node16
-  main: index.js
diff --git a/.github/bin/systemd-nspawn b/.github/bin/systemd-nspawn
new file mode 100644
index 0000000..96aa5fe
--- /dev/null
+++ b/.github/bin/systemd-nspawn
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+# https://gitlab.archlinux.org/archlinux/devtools/-/merge_requests/197
+
+args=("$@")
+has_keep_unit=0
+
+for arg in "${args[@]}"; do
+    if [[ "$arg" == "--keep-unit" ]]; then
+        has_keep_unit=1
+    fi
+done
+
+if ! (( has_keep_unit )); then
+    args=("--keep-unit" "${args[@]}")
+fi
+
+exec /usr/bin/systemd-nspawn "${args[@]}"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 6863541..aa6f1bb 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -88,6 +88,7 @@ jobs:
       - uses: actions/checkout@v3
       - name: Set proper repository url in PKGBUILD
         run: sed -i "s|%URL%|${{ github.server_url }}/${{ github.repository }}|" $GITHUB_WORKSPACE/tools/distro/arch/git/PKGBUILD
+      - run: echo "$GITHUB_WORKSPACE/.github/bin" >> "$GITHUB_PATH"
       - name: Build Arch Linux package
         uses: FFY00/build-arch-package@v1
         with: