From 87b453c3522a4550cf9972b2b794295c33642108 Mon Sep 17 00:00:00 2001
From: mithral <mithral@mithraic.cloud>
Date: Wed, 26 Aug 2026 14:11:23 -0400
Subject: [PATCH] CI: fix Fetch sources (remove broken heredoc; clean
 token-aware git clone)

---
 .gitea/workflows/build-pack.yaml | 29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/.gitea/workflows/build-pack.yaml b/.gitea/workflows/build-pack.yaml
index 820298f..279e83b 100644
--- a/.gitea/workflows/build-pack.yaml
+++ b/.gitea/workflows/build-pack.yaml
@@ -19,30 +19,13 @@ jobs:
 
       - name: Fetch sources
         run: |
-          if command -v git >/dev/null 2>&1; then
-            echo "git present -> cloning"
-            git clone --branch "${GITHUB_REF_NAME}" --depth 1 "https://x-access-token:${GITHUB_TOKEN}@git.mithraic.cloud/ad3laid3/FKRPG.git" "${GITHUB_WORKSPACE}"
+          REPO="https://git.mithraic.cloud/ad3laid3/FKRPG.git"
+          if [ -n "${GITHUB_TOKEN}" ]; then
+            git -c "credential.https://git.mithraic.cloud.username=x-access-token" \
+                -c "credential.https://git.mithraic.cloud.password=${GITHUB_TOKEN}" \
+                clone --branch "${GITHUB_REF_NAME}" --depth 1 "${REPO}" "${GITHUB_WORKSPACE}"
           else
-            echo "git missing -> downloading archive via API"
-            python3 - <<'PY'
-            import urllib.request, tarfile, io, os, shutil
-            ws = os.environ.get('GITHUB_WORKSPACE') or os.getcwd()
-            sha = os.environ['GITHUB_SHA']
-            token = os.environ.get('GITHUB_TOKEN', '')
-            url = f"https://git.mithraic.cloud/api/v1/repos/ad3laid3/FKRPG/archive/{sha}.tar.gz"
-            req = urllib.request.Request(url, headers={"Authorization": f"token {token}"})
-            raw = urllib.request.urlopen(req, timeout=120).read()
-            os.makedirs('/tmp/fkrpg_src', exist_ok=True)
-            with tarfile.open(fileobj=io.BytesIO(raw)) as tf:
-                tf.extractall('/tmp/fkrpg_src')
-            src = os.path.join('/tmp/fkrpg_src', os.listdir('/tmp/fkrpg_src')[0])
-            for name in os.listdir(src):
-                dst = os.path.join(ws, name)
-                if os.path.exists(dst):
-                    shutil.rmtree(dst) if os.path.isdir(dst) else os.remove(dst)
-                shutil.move(os.path.join(src, name), dst)
-            print("Extracted sources into", ws)
-            PY
+            git clone --branch "${GITHUB_REF_NAME}" --depth 1 "${REPO}" "${GITHUB_WORKSPACE}"
           fi
 
       - name: Refresh index