Merge pull request #3450 from Jookia/RFC_flatterpak

Fix flatpak properly
This commit is contained in:
Jonathan Campbell 2022-05-02 22:33:12 -07:00 committed by GitHub
commit ebf933a557
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View File

@ -31,7 +31,7 @@ modules:
- --disable-static
sources:
- type: archive
url: https://mesa.freedesktop.org/archive/glu/glu-9.0.2.tar.xz
url: https://ftp.osuosl.org/pub/blfs/conglomeration/glu/glu-9.0.2.tar.xz
sha256: 6e7280ff585c6a1d9dfcdf2fca489251634b3377bfc33c29e4002466a38d02d4
cleanup:
- /include

View File

@ -1,8 +1,7 @@
#!/bin/bash
if [[ ! $(flatpak list|grep org.flatpak.Builder|wc -l) -ge 1 ]]; then
echo Please ensure the flatpak builder is installed by running:
echo flatpak install flathub org.flatpak.Builder
if [[ ! -x $(which flatpak-builder) ]]; then
echo Please install flatpak-builder
exit
fi
@ -12,7 +11,7 @@ if [[ ! $(flatpak list|grep org.freedesktop.Sdk|wc -l) -ge 1 ]]; then
exit
fi
flatpak run org.flatpak.Builder --repo=myrepo --force-clean build-flatpak contrib/linux/com.dosbox_x.DOSBox-X.yaml
flatpak-builder --repo=myrepo --force-clean build-flatpak contrib/linux/com.dosbox_x.DOSBox-X.yaml
if [ $? -eq 0 ]; then
echo
echo You can now install the flatpak by running the following commands:
@ -24,5 +23,5 @@ if [ $? -eq 0 ]; then
echo flatpak run com.dosbox_x.DOSBox-X
echo
echo Or you can test it without installing by running:
echo flatpak run org.flatpak.Builder --run build-flatpak contrib/linux/com.dosbox_x.DOSBox-X.yaml dosbox-x
echo flatpak-builder --run build-flatpak contrib/linux/com.dosbox_x.DOSBox-X.yaml dosbox-x
fi