From 4a07ac8eb553083e5478fd1306430aa6446ad475 Mon Sep 17 00:00:00 2001 From: emmett1 Date: Wed, 11 Jun 2025 23:30:36 +0800 Subject: added check for spm MARKER --- apkg | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/apkg b/apkg index 2c4c363..058e824 100755 --- a/apkg +++ b/apkg @@ -369,11 +369,22 @@ build_src() { ret 1 fi - cd $PKG - spm -b $packagefile || { - msg "Failed packaging $packagefile" - ret 1 - } + # temporary: for backward compatibility + if [ "$(grep '#MARKER' /usr/bin/spm)" ] then + cd $PKG + spm -b $packagefile || { + msg "Failed packaging $packagefile" + ret 1 + } + else + cd $APKG_PACKAGE_DIR + spm -b $PKG && { + mv package.spm $packagefile + } || { + msg "Failed packaging $packagefile" + ret 1 + } + fi if [ ! -f "$HERE"/.files ] || [ "$HERE"/abuild -nt "$HERE"/.files ]; then pkg_updatefiles -- cgit v1.2.3