From f72bec0a24f0a336d65992724d97a43b92e060d7 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Wed, 2 Apr 2025 15:45:03 -0600 Subject: [PATCH] Make sure there are no duplicate appstream entries --- repo.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repo.sh b/repo.sh index 6d866519e..11092f3b4 100755 --- a/repo.sh +++ b/repo.sh @@ -91,7 +91,7 @@ done mkdir -p "$REPO" -APPSTREAM_SOURCES=() +declare -A APPSTREAM_SOURCES # Currently, we only support runtime dependencies for recipes in the new TOML # format. Runtime dependencies include both `[package.dependencies]` and @@ -119,7 +119,7 @@ do if [ -e "${COOKBOOK_STAGE}/usr/share/metainfo" ] then - APPSTREAM_SOURCES+=("${COOKBOOK_STAGE}") + APPSTREAM_SOURCES["$recipe"]="${COOKBOOK_STAGE}" fi done @@ -131,7 +131,7 @@ then APPSTREAM_PKG="$REPO/appstream.pkgar" rm -rf "${APPSTREAM_ROOT}" "${APPSTREAM_PKG}" mkdir -p "${APPSTREAM_ROOT}" - if [ -n "${APPSTREAM_SOURCES}" ] + if [ "${#APPSTREAM_SOURCES[@]}" -ne 0 ] then appstreamcli compose \ --origin=pkgar \