From cf3cd87016b501b1accd25460465abc0875253d7 Mon Sep 17 00:00:00 2001 From: ook37 Date: Sat, 13 Jul 2024 22:10:28 -0400 Subject: [PATCH 1/3] ci(srcinfo.sh): fix AARCH append --- scripts/srcinfo.sh | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/scripts/srcinfo.sh b/scripts/srcinfo.sh index 2cf7e5e2a9..27178c424c 100755 --- a/scripts/srcinfo.sh +++ b/scripts/srcinfo.sh @@ -153,7 +153,7 @@ function srcinfo.vars() { function srcinfo.write_global() { unset "${allvars[@]}" "${allars[@]}" - local CARCH='CARCH_REPLACE' DISTRO='DISTROBASE:DISTROVER' CDISTRO='CDISTROBASE:CDISTROVER' AARCH='AARCH_REPLACE' var ar aars bar ars rar rep seek + local CARCH='CARCH_REPLACE' DISTRO='DISTROBASE:DISTROVER' CDISTRO='CDISTROBASE:CDISTROVER' AARCH='AARCH_REPLACE' var ar aars bar ars rar rep seek multilist local -A AARCHS_MAP=( ["amd64"]="x86_64" ["arm64"]="aarch64" @@ -178,9 +178,14 @@ function srcinfo.write_global() { ) # shellcheck disable=SC1090 source "${1}" - for ar in "${allars[@]}"; do - [[ ${ar} != "arch" ]] \ - && local -n bar="${ar}" + multilist=("${multivalued_arch_attrs[@]}") + for i in "${multivalued_arch_attrs[@]}"; do + for j in {amd64,x86_64,arm64,aarch64,armel,arm,armhf,armv7h,i386,i686,mips64el,ppc64el,riscv64,s390x}; do + multilist+=("${i}_${j}") + done + done + for ar in "${multilist[@]}"; do + local -n bar="${ar}" if [[ -n ${bar[*]} ]]; then for ars in "${bar[@]}"; do ars="${ars//+([[:space:]])/ }" @@ -204,6 +209,7 @@ function srcinfo.write_global() { rep="${aars}" fi fi + local -n fin="${ar}_${rep}" # shellcheck disable=SC2076 if [[ " ${AARCHS_MAP[*]} " =~ " ${ar##*_} " || " ${!AARCHS_MAP[*]} " =~ " ${ar##*_} " || ${ar} == *"x86_64" ]]; then : "${ar}=${ars}" @@ -211,9 +217,13 @@ function srcinfo.write_global() { else : "${ar}_${aars}=${ars}" fi - eval "${_//${seek}/${rep}}" + if [[ -z ${fin[*]} ]]; then + eval "${_//${seek}/${rep}}" + fi done - unset "${ar}" + if [[ " ${multivalued_arch_attrs[*]} " =~ " ${ar} " ]]; then + unset "${ar}" + fi fi done fi From 3b26b2d769b0c51010c6ae45bda2869e89153795 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sun, 14 Jul 2024 02:12:49 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- packages/hakuneko-deb/.SRCINFO | 8 ++++---- packages/lsd-deb/.SRCINFO | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/hakuneko-deb/.SRCINFO b/packages/hakuneko-deb/.SRCINFO index d854691e55..9bab9c4855 100644 --- a/packages/hakuneko-deb/.SRCINFO +++ b/packages/hakuneko-deb/.SRCINFO @@ -8,13 +8,13 @@ pkgbase = hakuneko-deb arch = armhf arch = i386 maintainer = Diegiwg - source_amd64 = https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_CARCH_REPLACE.deb + source_amd64 = https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_amd64.deb sha256sums_amd64 = 48e9a77015695fe69390ac99b54184cf793f31c3452d174fcf41052ccb2ae211 - source_arm64 = https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_CARCH_REPLACE.deb + source_arm64 = https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_arm64.deb sha256sums_arm64 = 5e4b992b58a67ddac96410975e10577befe67479c1c2b3d12b2bcbaf6f6c003a - source_armhf = https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_CARCH_REPLACE.deb + source_armhf = https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_armhf.deb sha256sums_armhf = 4dabbfa9d775da72499f594bfdda86adc62a5caaa579c73b9d4ccf5d778c903d - source_i386 = https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_CARCH_REPLACE.deb + source_i386 = https://github.com/manga-download/hakuneko/releases/download/nightly-20200705.1/hakuneko-desktop_8.3.4_linux_i386.deb sha256sums_i386 = 3608ff4e8a3257fffedfa2dcea6501cb6d0d203235a2e4c6e6bbf01b93dce240 pkgname = hakuneko-deb diff --git a/packages/lsd-deb/.SRCINFO b/packages/lsd-deb/.SRCINFO index f79e695ec9..afbd880494 100644 --- a/packages/lsd-deb/.SRCINFO +++ b/packages/lsd-deb/.SRCINFO @@ -11,7 +11,7 @@ pkgbase = lsd-deb sha256sums_amd64 = 488b098e9cc4bb193c10d3a9abe8b06282099ee73a3e9f7f1febd19a9d9b89f0 source_arm64 = https://github.com/lsd-rs/lsd/releases/download/v1.0.0/lsd_1.0.0_arm64.deb sha256sums_arm64 = 4a0e6931823869b401a7ef3dae26e3c027aaee3c42bd62129ee2c6a93489412d - source_i386 = https://github.com/lsd-rs/lsd/releases/download/v1.0.0/lsd_1.0.0_i386.deb + source_i386 = https://github.com/lsd-rs/lsd/releases/download/v1.0.0/lsd_1.0.0_i686.deb sha256sums_i386 = 3a9d7193f90cce0884edb6f1c2230ec5cf942fd122e75691fc32cf3e8f728dcb pkgname = lsd-deb From edbb0be7b5a2de99c17881b97feb7c6843a39cb0 Mon Sep 17 00:00:00 2001 From: oklopfer <104327997+oklopfer@users.noreply.github.com> Date: Sat, 13 Jul 2024 22:18:11 -0400 Subject: [PATCH 3/3] Update srcinfo.sh --- scripts/srcinfo.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/srcinfo.sh b/scripts/srcinfo.sh index 27178c424c..a77b86c6f0 100755 --- a/scripts/srcinfo.sh +++ b/scripts/srcinfo.sh @@ -221,6 +221,7 @@ function srcinfo.write_global() { eval "${_//${seek}/${rep}}" fi done + # shellcheck disable=SC2076 if [[ " ${multivalued_arch_attrs[*]} " =~ " ${ar} " ]]; then unset "${ar}" fi