From cca6804964e28f81d382e3ac99584eee6508661e Mon Sep 17 00:00:00 2001
From: xavierk <xavierk@bongbetic.com>
Date: Tue, 15 Sep 2026 16:44:27 +0530
Subject: [PATCH] Fix XBPS publication artifact paths

---
 scripts/xbps-publish.sh | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/xbps-publish.sh b/scripts/xbps-publish.sh
index 3febfc4..9147d22 100755
--- a/scripts/xbps-publish.sh
+++ b/scripts/xbps-publish.sh
@@ -93,6 +93,8 @@ VERSION=$(_version)
 REVISION="${XBPS_REVISION:-1}"
 PKGVER="fenris-${VERSION}_${REVISION}"
 XBPS_FILE="${PKGVER}.${ARCH}.xbps"
+SOURCE_DIR=$(pwd)
+XBPS_PATH="${SOURCE_DIR}/${XBPS_FILE}"
 
 echo "=== Fenris XBPS Publication v${VERSION} ==="
 echo ""
@@ -111,7 +113,7 @@ echo ""
 # ── Step 2: Sign package ─────────────────────────────────────────────────
 
 echo "--- Sign XBPS package ---"
-_run "xbps-rindex --sign-pkg --privkey ${XBPS_SIGNING_KEY} ${XBPS_FILE}"
+_run "xbps-rindex --sign-pkg --privkey ${XBPS_SIGNING_KEY} ${XBPS_PATH}"
 echo ""
 
 # ── Step 3: Clone/update distribution repository ─────────────────────────
@@ -119,24 +121,24 @@ echo ""
 echo "--- Prepare distribution repository ---"
 WORK_DIR=$(mktemp -d)
 _run "git clone ${GITEA_URL}/${GITEA_OWNER}/${GITEA_REPO}.git ${WORK_DIR}"
-_run "cd ${WORK_DIR} && git checkout ${GITEA_BRANCH}"
+_run "git -C ${WORK_DIR} checkout ${GITEA_BRANCH}"
 _run "mkdir -p ${WORK_DIR}/${ARCH}"
 echo ""
 
 # ── Step 4: Copy artifacts and update index ──────────────────────────────
 
 echo "--- Update repository index ---"
-_run "cp ${XBPS_FILE} ${XBPS_FILE}.sig2 ${WORK_DIR}/${ARCH}/"
-_run "cd ${WORK_DIR} && xbps-rindex --add ${ARCH}/${XBPS_FILE}"
-_run "cd ${WORK_DIR} && xbps-rindex --sign --privkey ${XBPS_SIGNING_KEY} --signedby '${SIGNED_BY}' ${ARCH}"
+_run "cp ${XBPS_PATH} ${XBPS_PATH}.sig2 ${WORK_DIR}/${ARCH}/"
+_run "xbps-rindex --add ${WORK_DIR}/${ARCH}/${XBPS_FILE}"
+_run "xbps-rindex --sign --privkey ${XBPS_SIGNING_KEY} --signedby '${SIGNED_BY}' ${WORK_DIR}/${ARCH}"
 echo ""
 
 # ── Step 5: Commit and push ──────────────────────────────────────────────
 
 echo "--- Commit and push ---"
-_run "cd ${WORK_DIR} && git add -A"
-_run "cd ${WORK_DIR} && git commit -m 'Release fenris ${VERSION}'"
-_run "cd ${WORK_DIR} && git push origin ${GITEA_BRANCH}"
+_run "git -C ${WORK_DIR} add -A"
+_run "git -C ${WORK_DIR} commit -m 'Release fenris ${VERSION}'"
+_run "git -C ${WORK_DIR} push origin ${GITEA_BRANCH}"
 echo ""
 
 # ── Step 6: Verify publication ───────────────────────────────────────────