Skip to content

worker.sh: read AppStream metainfo under its current name (*.metainfo.xml) too #3874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
budbrain-software wants to merge 1 commit into
base: master
Choose a base branch
from
Open

worker.sh: read AppStream metainfo under its current name (*.metainfo.xml) too #3874

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions code/worker.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,11 +445,16 @@ sudo chmod a+x appstreamcli-x86_64.AppImage
echo "layout: app" >> apps/$INPUTBASENAME.md
echo "" >> apps/$INPUTBASENAME.md
echo "permalink: /$INPUTBASENAME/" >> apps/$INPUTBASENAME.md
# AppStream metainfo is named either <id>.appdata.xml (legacy) or
# <id>.metainfo.xml (current); both are copied in above, so use whichever is
# there. Applications shipping the current name would otherwise silently fall
# back to the .desktop Comment and to the automatically taken screenshot.
AS_XML=$(ls database/$INPUTBASENAME/*.appdata.xml database/$INPUTBASENAME/*.metainfo.xml 2>/dev/null | head -n 1)
# Description
DESKTOP_COMMENT=$(grep "^Comment=.*" database/$INPUTBASENAME/*.desktop | cut -d '=' -f 2- ) || true
if [ -f database/$INPUTBASENAME/*appdata.xml ] ; then
./appstreamcli-x86_64.AppImage convert database/$INPUTBASENAME/*appdata.xml database/$INPUTBASENAME/appdata.yaml
SUMMARY=$(cat database/$INPUTBASENAME/*appdata.xml | xmlstarlet sel -t -m "/component/summary[1]" -v .) || true
if [ -n "$AS_XML" ] ; then
./appstreamcli-x86_64.AppImage convert "$AS_XML" database/$INPUTBASENAME/appdata.yaml
SUMMARY=$(xmlstarlet sel -t -m "/component/summary[1]" -v . "$AS_XML") || true
if [ x"$SUMMARY" != x"" ] ; then
echo "description: $SUMMARY" >> apps/$INPUTBASENAME.md
fi
Expand Down Expand Up @@ -483,8 +488,8 @@ sudo chmod a+x appstreamcli-x86_64.AppImage
echo " - $INPUTBASENAME/icons/$ICONSIZE/$ICONBASENAME" >> apps/$INPUTBASENAME.md
fi
# Screenshot
if [ -f database/$INPUTBASENAME/*appdata.xml ] ; then
SCREENSHOT=$(cat database/$INPUTBASENAME/*appdata.xml | xmlstarlet sel -t -m "/component/screenshots/screenshot[1]/image" -v . || true)
if [ -n "$AS_XML" ] ; then
SCREENSHOT=$(xmlstarlet sel -t -m "/component/screenshots/screenshot[1]/image" -v . "$AS_XML" || true)
if [ x"$SCREENSHOT" != x"" ] ; then
echo "screenshots:" >> apps/$INPUTBASENAME.md
echo "- $SCREENSHOT" >> apps/$INPUTBASENAME.md
Expand Down