fix({srcinfo,package-base}.sh): add missing overrides and append arra…

…ys (pacstall#1176) Co-authored-by: ook37 <[email protected]>
Elsie19 · Jul 7, 2024 · ea75e9d · ea75e9d
1 parent 54706c4
commit ea75e9d
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 16 deletions.
diff --git a/misc/scripts/package-base.sh b/misc/scripts/package-base.sh
@@ -55,7 +55,7 @@ function package_override() {
     { ignore_stack=false; set -o pipefail; trap stacktrace ERR RETURN; }
     # shellcheck disable=SC2031
     local o all_ovars opac="${pacname}" obase="${pkgbase}" ovars=("gives" "pkgdesc" "url" "priority")
-    all_ovars=("${ovars[@]}" "arch" "license" "checkdepends" "optdepends" "pacdeps" "provides" "conflicts" "breaks" "replaces" "enhances" "recommends" "backup" "repology")
+    all_ovars=("${ovars[@]}" "arch" "license" "depends" "checkdepends" "optdepends" "pacdeps" "provides" "checkconflicts" "conflicts" "breaks" "replaces" "enhances" "recommends" "backup" "repology")
     for o in "${all_ovars[@]}"; do
         local look lbase
         # shellcheck disable=SC2034

diff --git a/misc/scripts/srcinfo.sh b/misc/scripts/srcinfo.sh
@@ -52,7 +52,7 @@ function srcinfo.array_build() {
 }
 
 function srcinfo.extr_globvar() {
-    { ignore_stack=false; set -eo pipefail; trap stacktrace ERR RETURN; }
+    { ignore_stack=false; set -o pipefail; trap stacktrace ERR RETURN; }
     local attr="${1}" isarray="${2}" outputvar="${3}" ref
     if ((isarray==1)); then
         srcinfo.array_build ref "${attr}"
@@ -87,10 +87,15 @@ function srcinfo.extr_fnvar() {
 function srcinfo.get_attr() {
     { ignore_stack=false; set -o pipefail; trap stacktrace ERR RETURN; }
     local pkgname="${1}" attrname="${2}" isarray="${3}" outputvar="${4}"
+    if ((isarray==1)); then
+        eval "${outputvar}=()"
+    else
+        printf -v "${outputvar}" %s ''
+    fi
     if [[ -n ${pkgname} ]]; then
         srcinfo.extr_globvar "${attrname}" "${isarray}" "${outputvar}"
         if is_function "package_${pkgname}"; then
-            srcinfo.extr_fnvar "package_${pkgname}" "${attrname}" "${isarray}" "${outputvar}"
+            srcinfo.extr_fnvar "package_${pkgname}" "${attrname}" "${isarray}" "${outputvar}" || { ignore_stack=true; return 1; }
         fi
     else
         srcinfo.extr_globvar "${attrname}" "${isarray}" "${outputvar}"
@@ -103,7 +108,9 @@ function srcinfo.write_attr() {
     attrvalues=("${attrvalues[@]//+([[:space:]])/ }")
     attrvalues=("${attrvalues[@]#[[:space:]]}")
     attrvalues=("${attrvalues[@]%[[:space:]]}")
-    printf "\t${attrname} = %s\n" "${attrvalues[@]}"
+    if [[ -n "${attrvalues[*]}" ]]; then
+        printf "\t${attrname} = %s\n" "${attrvalues[@]}"
+    fi
 }
 
 function srcinfo.extract() {
@@ -118,13 +125,11 @@ function srcinfo.write_details() {
     { ignore_stack=false; set -o pipefail; trap stacktrace ERR RETURN; }
     local attr package_arch a
     for attr in "${singlevalued[@]}"; do
-        local -n at="${attr}"
-        [[ -n ${at} ]] && srcinfo.extract "$1" "${attr}" 0
+        srcinfo.extract "$1" "${attr}" 0
     done
 
     for attr in "${multivalued[@]}"; do
-        local -n at="${attr}"
-        [[ -n ${at[*]} ]] && srcinfo.extract "$1" "${attr}" 1
+        srcinfo.extract "$1" "${attr}" 1
     done
 
     srcinfo.get_attr "$1" 'arch' 1 'package_arch' || package_arch=("all")
@@ -227,8 +232,8 @@ function srcinfo.write_global() {
 function srcinfo.write_package() {
     { ignore_stack=false; set -o pipefail; trap stacktrace ERR RETURN; }
     local singlevalued=(gives pkgdesc url priority)
-    local multivalued=(arch license checkdepends optdepends pacdeps
-        provides conflicts breaks replaces enhances recommends backup repology)
+    local multivalued=(arch license depends checkdepends optdepends pacdeps
+        provides checkconflicts conflicts breaks replaces enhances recommends backup repology)
     printf '%s = %s\n' 'pkgname' "$1"
     srcinfo.write_details "$1"
 }
@@ -567,7 +572,9 @@ function srcinfo.match_pkg() {
                 continue
             fi
         fi
-        [[ ${b} == "${match}" ]] && printf '%s\n' "${!guy}"
+        if [[ ${b} == "${match}" ]]; then
+            printf '%s\n' "${!guy}"
+        fi
     done
 }
 

diff --git a/pacstall b/pacstall
@@ -460,8 +460,8 @@ function download() {
 # This will then output the options given by the user to ${PACDIR}-selectopts-${varname}-${pacname}, which you can then turn into another array
 function select_options() {
     { ignore_stack=false; set -o pipefail; trap stacktrace ERR RETURN; }
-    local message="${1}" length="${2}" varname="${3}"
-    rm -f "${PACDIR}-selectopts-${varname}-${pacname}"
+    local message="${1}" length="${2}" varname="${3}" optname="${pkgbase:-${pacname}}"
+    rm -f "${PACDIR}-selectopts-${varname}-${optname}"
     if ((length >= 6)); then
         echo -ne "${message} [${BOLD}1-$length${NC} or ${BIGreen}Y${NC}] "
     else
@@ -480,9 +480,9 @@ function select_options() {
         input="Y"
     fi
     if [[ -z $input ]] || [[ $input =~ ^[Yy]$ ]]; then
-        seq -s ' ' 1 "$length" | tee "${PACDIR}-selectopts-${varname}-${pacname}" > /dev/null
+        seq -s ' ' 1 "$length" | tee "${PACDIR}-selectopts-${varname}-${optname}" > /dev/null
     elif ((input == 0)) || [[ $input =~ ^[Nn]$ ]]; then
-        echo "n" | tee "${PACDIR}-selectopts-${varname}-${pacname}" > /dev/null
+        echo "n" | tee "${PACDIR}-selectopts-${varname}-${optname}" > /dev/null
     elif ! [[ $input =~ [a-zA-Z]+ ]] || [[ $input =~ ^[0-9]+$ ]]; then
         for i in "${input[@]}"; do
             unset split_arr
@@ -511,7 +511,7 @@ function select_options() {
                 out+=("$i")
             fi
         done
-        echo "${out[@]}" | tee "${PACDIR}-selectopts-${varname}-${pacname}" > /dev/null
+        echo "${out[@]}" | tee "${PACDIR}-selectopts-${varname}-${optname}" > /dev/null
     else
         select_options "$message" "$length" "$varname"
     fi