Update in-tree flatpak to closer match flathub

This updates the in-tree flatpak manifests to closer match
that used by flathub. This should make it easier to diagnose
problems.

It also adds some new checks to the make-flathub*.sh scripts.
This commit is contained in:
rderooy
2020-10-04 18:56:18 +02:00
parent f7687255fc
commit e8f2b029ce
4 changed files with 66 additions and 91 deletions

View File

@@ -1,20 +1,27 @@
#!/bin/sh
# flatpak build will fail immediately if it cannot find the metainfo.xml file
# But we have a dosbox-x.metainfo.xml.in file that first needs processing by autotools
./autogen.sh
./configure
if [[ ! -x $(which flatpak-builder) ]]; then
echo Please install flatpak-builder
exit
fi
cd contrib/linux
flatpak-builder --repo=../../repo --force-clean ../../build-flatpak com.dosbox_x.DOSBox-X-sdl2.yaml
if [[ ! $(flatpak list|grep org.freedesktop.Sdk|wc -l) -ge 1 ]]; then
echo Please ensure the necessary SDK and matching runtime are installed by running:
echo flatpak install flathub org.freedesktop.Platform//20.08 org.freedesktop.Sdk//20.08
exit
fi
flatpak-builder --repo=myrepo --force-clean build-flatpak contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml
if [ $? -eq 0 ]; then
echo
echo You can now install the flatpak by running the following commands:
echo
echo flatpak --user remote-add --no-gpg-verify myrepo repo
echo flatpak --user install myrepo com.dosbox_x.DOSBox-X-sdl2
echo
echo You can then run the flatpak as follows:
echo flatpak run com.dosbox_x.DOSBox-X-sdl2
echo
echo Or you can test it without installing by running:
echo flatpak-builder --run build-flatpak contrib/linux/com.dosbox_x.DOSBox-X-sdl2.yaml dosbox-x-sdl2
fi
cd ../..