filter fields in functions

action.yml

@@ -1,25 +1,32 @@
 name: "Make SRCINFO"
 description: "Generate .SRCINFO file from PKGBUILD"
 inputs:
-  pkgbuild-file:
+  pkgbuild-path:
     description: "Path to PKGBUILD file"
-  srcinfo-file:
+  srcinfo-path:
     description: "Path to .SRCINFO file to be created"
     default: ".SRCINFO"
 outputs:
   version:
     description: "Version of the package"
+    value: ${{ steps.get-version.outputs.version }}
 runs:
   using: "composite"
   steps:
     - name: "Make SRCINFO"
       shell: bash
-      run: "./mksrcinfo.sh $PKGBUILD_PATH > $SRCINFO_PATH"
+      run: |
+        echo "PKGBUILD_PATH: $PKGBUILD_PATH"
+        echo "SRCINFO_PATH: $SRCINFO_PATH"
+        $GITHUB_ACTION_PATH/mksrcinfo.sh $PKGBUILD_PATH > $SRCINFO_PATH
       env:
-        PKGBUILD_PATH: ${{ inputs.pkgbuild-file }}
+        PKGBUILD_PATH: ${{ inputs.pkgbuild-path }}
-        SRCINFO_PATH: ${{ inputs.srcinfo-file }}
+        SRCINFO_PATH: ${{ inputs.srcinfo-path }}
     - name: "Get version"
+      id: get-version
       shell: bash
-      run: "grep 'pkgver = ' $SRCINFO_PATH | sed 's/ = /=/' >> $GITHUB_OUTPUT"
+      run: |
+        grep 'pkgver = ' $SRCINFO_PATH | sed -e 's/^\s*//' -e 's/ = /=/'
+        grep 'pkgver = ' $SRCINFO_PATH | sed -e 's/^\s*//' -e 's/ = /=/' -e 's/pkgver/version/' >> $GITHUB_OUTPUT
       env:
-        SRCINFO_PATH: ${{ inputs.srcinfo-file }}
+        SRCINFO_PATH: ${{ inputs.srcinfo-path }}

mksrcinfo.sh

@@ -7,9 +7,6 @@ section_arch_fields=(source depends checkdepends makedepends optdepends provides
 section_array_fields=(arch groups license noextract options backup validpgpkeys "${section_arch_fields[@]}")
 section_fields=("${section_scalar_fields[@]}" "${section_array_fields[@]}")
 
-# load PKGBUILD
-source "${1:-./PKGBUILD}"
-
 # check if a variable is an array
 is_array() {
 	[[ "$(declare -p $1)" =~ "declare -a" ]]
@@ -43,17 +40,18 @@ print_array_field() {
 }
 
 # load section content from its package function
+for field in "${section_fields[@]}"; do
+	_load_section_content_fields_pattern="$field|$_load_section_content_fields_pattern"
+done
 load_section_content() {
 	if [[ -n $1 ]]; then
 		suffix="_$1"
-	else
-		suffix=""
 	fi
 	if [[ ! "$(type -t "package$suffix")" = function ]]; then return; fi
 	# eval only variable assignments in package function
 	while read -r line; do
 		eval "$line"
-	done < <(declare -f "package$suffix" | grep -E '^[[:space:]]*(declare +)?[[:alnum:]_]*=')
+	done < <(declare -f "package$suffix" | grep -E "^[[:space:]]*(declare +)?($_load_section_content_fields_pattern)=" | sed 's/^[[:space:]]*(declare +)?//')
 }
 
 # print fields for a section
@@ -74,6 +72,13 @@ print_section_content() {
 }
 
 # main
+for field in "${base_fields[@]}"; do
+	eval "unset $field"
+done
+clear_fields
+
+# load PKGBUILD
+source "${1:-./PKGBUILD}"
 
 # determine pkgbase
 if ! is_array pkgname; then