From 501f0b145ca23830ed9e9c68e3068924818f3444 Mon Sep 17 00:00:00 2001 From: Thomas Bertels <3265870+tbertels@users.noreply.github.com> Date: Mon, 12 Jan 2026 00:02:40 +0100 Subject: [PATCH 1/3] worker: Fix License search and add error message --- code/worker.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/code/worker.sh b/code/worker.sh index cbb2146b30..d1111cc3e5 100644 --- a/code/worker.sh +++ b/code/worker.sh @@ -459,14 +459,22 @@ sudo chmod a+x appstreamcli-x86_64.AppImage # License AS_LICENSE="" DT_LICENSE="" - if [ -f database/$INPUTBASENAME/*appdata.xml ] ; then - AS_LICENSE=$(cat database/$INPUTBASENAME/*appdata.xml | xmlstarlet sel -t -m "/component/project_license" -v .) || true - fi - DT_LICENSE=$(grep -r "X-AppImage-Payload-License=.*" database/$INPUTBASENAME/*.desktop | cut -d '=' -f 2) + AS_LICENSE=$( + xmlstarlet sel -t \ + -m "/component/project_license" -v . \ + $(ls database/$INPUTBASENAME/*.{appdata,metainfo}.xml 2>/dev/null) + ) || true + DT_LICENSE=$( + grep -h "X-AppImage-Payload-License=" database/$INPUTBASENAME/*.desktop 2>/dev/null \ + | cut -d '=' -f 2 + ) || true if [ x"$AS_LICENSE" != x"" ] ; then echo "license: $AS_LICENSE" >> apps/$INPUTBASENAME.md elif [ x"$DT_LICENSE" != x"" ] ; then echo "license: $DT_LICENSE" >> apps/$INPUTBASENAME.md + else + echo "No license found!" + exit 1 fi # Icon ICONBASENAME=$(basename "$ICONFILE") From 47b03b363217ca3fd3eae6fa948af054656c9c35 Mon Sep 17 00:00:00 2001 From: Thomas Bertels <3265870+tbertels@users.noreply.github.com> Date: Mon, 12 Jan 2026 00:37:10 +0100 Subject: [PATCH 2/3] worker: Fix Authors search --- code/worker.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/code/worker.sh b/code/worker.sh index d1111cc3e5..f46ca8fdfd 100644 --- a/code/worker.sh +++ b/code/worker.sh @@ -498,9 +498,13 @@ sudo chmod a+x appstreamcli-x86_64.AppImage # Authors echo "" >> apps/$INPUTBASENAME.md echo "authors:" >> apps/$INPUTBASENAME.md - GH_USER=$(grep "^https://github.com.*" data/$INPUTBASENAME | cut -d '/' -f 4 ) - GH_REPO=$(grep "^https://github.com.*" data/$INPUTBASENAME | cut -d '/' -f 5 ) - OBS_USER=$(grep "^http.*://download.opensuse.org/repositories/home:/" data/$INPUTBASENAME | cut -d "/" -f 6 | sed -e 's|:||g') + GH_USER=$(grep "^https://github.com/" data/$INPUTBASENAME | cut -d '/' -f 4) || true + GH_REPO=$(grep "^https://github.com/" data/$INPUTBASENAME | cut -d '/' -f 5) || true + OBS_USER=$( + grep -h "^http.*://download.opensuse.org/repositories/home:/" "data/$INPUTBASENAME" 2>/dev/null \ + | cut -d "/" -f 6 \ + | sed 's|:||g' + ) || true # BB_USER=$(grep "^https://bitbucket.org.*" data/$INPUTBASENAME | cut -d '/' -f 4 ) # BB_REPO=$(grep "^https://bitbucket.org.*" data/$INPUTBASENAME | cut -d '/' -f 5 ) if [ x"$GH_USER" == x"" ] ; then From 795ce9753b766a69241b260b08fe9de37f8c8646 Mon Sep 17 00:00:00 2001 From: Thomas Bertels <3265870+tbertels@users.noreply.github.com> Date: Mon, 12 Jan 2026 00:42:04 +0100 Subject: [PATCH 3/3] worker: Fix Links search --- code/worker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/worker.sh b/code/worker.sh index f46ca8fdfd..37ed22d9a5 100644 --- a/code/worker.sh +++ b/code/worker.sh @@ -530,7 +530,7 @@ sudo chmod a+x appstreamcli-x86_64.AppImage echo " - type: Download" >> apps/$INPUTBASENAME.md echo " url: https://github.com/$GH_USER/$GH_REPO/releases" >> apps/$INPUTBASENAME.md fi - OBS_LINK=$(grep "^http.*://download.opensuse.org.*latest.*AppImage$" data/$INPUTBASENAME | sed -e 's|http://d|https://d|g') + OBS_LINK=$(grep "^http.*://download.opensuse.org.*latest.*AppImage$" data/$INPUTBASENAME | sed -e 's|http://d|https://d|g') || true if [ x"$OBS_LINK" != x"" ] ; then echo " - type: Download" >> apps/$INPUTBASENAME.md echo " url: $OBS_LINK.mirrorlist" >> apps/$INPUTBASENAME.md