Fix version

Author: AdrianTM

CMakeLists.txt

@@ -40,14 +40,19 @@ if(DEFINED PROJECT_VERSION_OVERRIDE AND NOT "${PROJECT_VERSION_OVERRIDE}" STREQU
     message(STATUS "Using version override: ${PROJECT_VERSION_FROM_METADATA}")
 elseif(EXISTS ${CMAKE_SOURCE_DIR}/PKGBUILD)
     file(READ ${CMAKE_SOURCE_DIR}/PKGBUILD PROJECT_PKGBUILD_CONTENT)
-    string(REGEX MATCH "^[ \t]*pkgver=([^ \t\r\n]+)" _pkgver_match "${PROJECT_PKGBUILD_CONTENT}")
-    set(PROJECT_PKGBUILD_VER "${CMAKE_MATCH_1}")
-    string(REGEX MATCH "^[ \t]*pkgrel=([^ \t\r\n]+)" _pkgrel_match "${PROJECT_PKGBUILD_CONTENT}")
-    set(PROJECT_PKGBUILD_REL "${CMAKE_MATCH_1}")
+    string(REGEX MATCH "(^|[\r\n])[ \t]*pkgver=([^ \t\r\n]+)" _pkgver_match "${PROJECT_PKGBUILD_CONTENT}")
+    set(PROJECT_PKGBUILD_VER "${CMAKE_MATCH_2}")
+    string(REGEX MATCH "(^|[\r\n])[ \t]*pkgrel=([^ \t\r\n]+)" _pkgrel_match "${PROJECT_PKGBUILD_CONTENT}")
+    set(PROJECT_PKGBUILD_REL "${CMAKE_MATCH_2}")
     if(_pkgver_match)
+        # Support pkgver=${PKGVER:-<version>} default syntax
+        string(REGEX MATCH "^\\$\\{PKGVER:-([^}]+)\\}$" _pkgver_default_match "${PROJECT_PKGBUILD_VER}")
+        if(_pkgver_default_match)
+            set(PROJECT_PKGBUILD_VER "${CMAKE_MATCH_1}")
+        endif()
         set(PROJECT_VERSION_FROM_METADATA "${PROJECT_PKGBUILD_VER}")
         if(_pkgrel_match)
-            set(PROJECT_VERSION_FROM_METADATA "${PROJECT_VERSION_FROM_METADATA}-${PROJECT_PKGBUILD_REL}")
+            set(PROJECT_VERSION_PKGREL "${PROJECT_PKGBUILD_REL}")
         endif()
         message(STATUS "Using version from PKGBUILD: ${PROJECT_VERSION_FROM_METADATA}")
     endif()

PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: Adrian <adrian@mxlinux.org>
 pkgname=mx-packageinstaller
-pkgver=${PKGVER:-25.12.4}
+pkgver=${PKGVER:-26.01}
 pkgrel=1
 pkgdesc="MX Package Installer - a tool for managing packages and Flatpaks"
 arch=('x86_64' 'i686')

build.sh

@@ -87,12 +87,17 @@ if [ "$ARCH_BUILD" = true ]; then
         echo "Error: PKGBUILD not found; cannot determine version for Arch build."
         exit 1
     fi
-    PKGVER=$(sed -n 's/^pkgver=//p' PKGBUILD | head -n 1)
+    PKGVER_LINE=$(sed -n 's/^pkgver=//p' PKGBUILD | head -n 1)
     PKGREL=$(sed -n 's/^pkgrel=//p' PKGBUILD | head -n 1)
-    if [ -z "$PKGVER" ]; then
+    if [ -z "$PKGVER_LINE" ]; then
         echo "Error: could not parse pkgver from PKGBUILD."
         exit 1
     fi
+    if [[ "$PKGVER_LINE" =~ ^\$\{PKGVER:-([^}]+)\}$ ]]; then
+        PKGVER="${BASH_REMATCH[1]}"
+    else
+        PKGVER="$PKGVER_LINE"
+    fi
     if [ -n "$PKGREL" ]; then
         ARCH_VERSION="${PKGVER}-${PKGREL}"
     else
@@ -108,7 +113,7 @@ if [ "$ARCH_BUILD" = true ]; then
     PKG_DEST_DIR="$PWD/build"
     mkdir -p "$PKG_DEST_DIR"
 
-    PKGDEST="$PKG_DEST_DIR" PKGVER="$ARCH_VERSION" makepkg -f
+    PKGDEST="$PKG_DEST_DIR" PKGVER="$PKGVER" PKGREL="$PKGREL" makepkg -f
 
     echo "Cleaning makepkg artifacts..."
     rm -rf pkg