From b4efcdbaa60cf0e719f6df266d60a79a96d95c1e Mon Sep 17 00:00:00 2001
From: Mark Riedesel <mark@klowner.com>
Date: Mon, 18 Nov 2024 12:21:07 -0600
Subject: [PATCH] do the proot nonsense in woodpecker

---
 .woodpecker.yaml | 1 +
 build-iso        | 8 --------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/.woodpecker.yaml b/.woodpecker.yaml
index 4e034c7..988ab46 100644
--- a/.woodpecker.yaml
+++ b/.woodpecker.yaml
@@ -7,6 +7,7 @@ steps:
     image: docker.io/archlinux:base-devel
     commands: 
       - pacman -Sy
+      - curl -L https://proot.gitlab.io/proot/bin/proot /usr/local/bin/chroot && chmod +x /usr/local/bin/chroot
       - ./build-iso
       - eval $(grep iso_ archiso/profiledef.sh)
       - ISO_FILE="archiso/out/$iso_name-$iso_version-x86_64.iso"
diff --git a/build-iso b/build-iso
index bd134f6..2333a8d 100755
--- a/build-iso
+++ b/build-iso
@@ -26,13 +26,6 @@ function install_archiso {
 	fi
 }
 
-function install_proot {
-	if ! type proot >/dev/null 2>&1; then
-		curl -L https://proot.gitlab.io/proot/bin/proot -O /usr/local/bin/proot
-		chmod +x /usr/local/bin/proot
-	fi
-}
-
 function prepare {
 	install_archiso
 	[ -d "$build_dir" ] && as_root rm -rf "$build_dir"
@@ -86,7 +79,6 @@ function pubkey_config {
 
 function build_iso {
 	temp_dir=$(as_root mktemp -d)
-	alias chroot=proot
 	as_root chmod 755 "$temp_dir"
 	as_root mkarchiso -v -w "$temp_dir/archiso" -o "$build_dir"/out "$build_dir" && echo "ISO build complete"
 	as_root rm -rf "$temp_dir"