diff options
| author | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-31 12:09:05 +0200 |
|---|---|---|
| committer | ohfp <1813007-ohfp@users.noreply.gitlab.com> | 2020-03-31 12:09:05 +0200 |
| commit | 01f4e24e4049070b1a415706daeec31f462d91fc (patch) | |
| tree | 4c2790c32fc76f7946d6daca6f50dbf7a5569b8a | |
| parent | fix some env vars for aarch64 builds (diff) | |
| download | librewolf-linux-01f4e24e4049070b1a415706daeec31f462d91fc.tar.gz librewolf-linux-01f4e24e4049070b1a415706daeec31f462d91fc.tar.bz2 librewolf-linux-01f4e24e4049070b1a415706daeec31f462d91fc.zip | |
add appstream metadata to flatpak and appimage; include libdbus-glib-1.so.2 in appimage as well, just in case
| -rwxr-xr-x | appimage/build_appimage.sh | 6 | ||||
| -rwxr-xr-x | flatpak/build_flatpak.sh | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh index f8e8c1a..b19a508 100755 --- a/appimage/build_appimage.sh +++ b/appimage/build_appimage.sh @@ -46,6 +46,12 @@ apt -qq update && apt -qqy install wget; wget $_APPIMAGETOOL_DOWNLOAD_URL -O $_APPIMAGETOOL_FILE; chmod +x $_APPIMAGETOOL_FILE; +# add appstream metadata +install -Dvm644 "$_BINARY_TARBALL_EXTRACTED_FOLDER/io.gitlab.LibreWolf.appdata.xml" "$_BINARY_TARBALL_EXTRACTED_FOLDER/share/metainfo/io.gitlab.LibreWolf.appdata.xml" + +# add libdbus-glib-1.so.2, just in case +install -Dvm644 "/usr/lib/{$CARCH}-linux-gnu/libdbus-glib-1.so.2" "$_BINARY_TARBALL_EXTRACTED_FOLDER/usr/lib/libdbus-glib-1.so."2 + # Generate AppImage printf "\nGenerating AppImage\n"; ARCH=${CARCH} $_APPIMAGETOOL_FILE --appimage-extract-and-run\ diff --git a/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh index 41814bf..d515ef6 100755 --- a/flatpak/build_flatpak.sh +++ b/flatpak/build_flatpak.sh @@ -52,6 +52,10 @@ printf "\nBuilding flatpak repository\n"; cp "$_FLATPAK_JSON_FILE" ./; flatpak-builder --disable-rofiles-fuse --repo="$FLATPAK_REPO" "$_FLATPAK_BUILD_FOLDER" io.gitlab.LibreWolf.json; +# add appstream metadata +# TODO: firefox uses files/share/appdata/ in their flatpak, but https://docs.flatpak.org/en/latest/conventions.html says otherwise. which is "more" correct? +install -Dvm644 "$_EXTRACTED_BINARY_TARBALL_FOLDER/io.gitlab.LibreWolf.appdata.xml" "$_FLATPAK_BUILD_FOLDER/files/share/metainfo/io.gitlab.LibreWolf.appdata.xml" + # Build bundle printf "\nBuilding flatpak bundle\n"; flatpak build-bundle $FLATPAK_REPO $FLATPAK_BUNDLE io.gitlab.LibreWolf master; |