From f471d64277943964e3ecc78ea48421aa2a97f01d Mon Sep 17 00:00:00 2001
From: ohfp <1813007-ohfp@users.noreply.gitlab.com>
Date: Fri, 8 May 2020 11:34:40 +0200
Subject: Drop AppImage validation

The AppImage validation tools complain even when one follows their
recommendations on supplying AppStream metadata and with correctly named
files. I'm now starting to understand why most AppImages don't bother
with it.
---
 appimage/build_appimage.sh                   |  8 ++------
 appimage/content/io.gitlab.LibreWolf.desktop | 12 ++++++++++++
 appimage/content/librewolf.desktop           | 12 ------------
 3 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 appimage/content/io.gitlab.LibreWolf.desktop
 delete mode 100644 appimage/content/librewolf.desktop

diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh
index 4229004..5cc1b9e 100755
--- a/appimage/build_appimage.sh
+++ b/appimage/build_appimage.sh
@@ -46,13 +46,9 @@ apt -qq update && apt -qqy install wget;
 wget $_APPIMAGETOOL_DOWNLOAD_URL -O $_APPIMAGETOOL_FILE;
 chmod +x $_APPIMAGETOOL_FILE;
 
-# Installs appstream-util and appstreamcli
-apt -qqy install appstream-util appstream
-
 # add appstream metadata
-install -Dvm644 "$_BINARY_TARBALL_EXTRACTED_FOLDER/io.gitlab.LibreWolf.appdata.xml" "$_BINARY_TARBALL_EXTRACTED_FOLDER/usr/share/metainfo/librewolf.appdata.xml"
-
-# install -Dvm644 "$_BINARY_TARBALL_EXTRACTED_FOLDER/librewolf.desktop" "$_BINARY_TARBALL_EXTRACTED_FOLDER/io.gitlab.LibreWolf.desktop"
+install -Dvm644 "$_BINARY_TARBALL_EXTRACTED_FOLDER/io.gitlab.LibreWolf.appdata.xml" "$_BINARY_TARBALL_EXTRACTED_FOLDER/usr/share/metainfo/io.gitlab.LibreWolf.appdata.xml"
+rm -f "$_BINARY_TARBALL_EXTRACTED_FOLDER/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
diff --git a/appimage/content/io.gitlab.LibreWolf.desktop b/appimage/content/io.gitlab.LibreWolf.desktop
new file mode 100644
index 0000000..c6d6de1
--- /dev/null
+++ b/appimage/content/io.gitlab.LibreWolf.desktop
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=LibreWolf
+Exec=librewolf %u
+Icon=librewolf
+Type=Application
+MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
+StartupWMClass=LibreWolf
+Categories=Network;WebBrowser;
+StartupNotify=true
+Terminal=false
+X-MultipleArgs=false
+Keywords=Internet;WWW;Browser;Web;Explorer
diff --git a/appimage/content/librewolf.desktop b/appimage/content/librewolf.desktop
deleted file mode 100644
index c6d6de1..0000000
--- a/appimage/content/librewolf.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=LibreWolf
-Exec=librewolf %u
-Icon=librewolf
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;application/x-xpinstall;application/pdf;application/json;
-StartupWMClass=LibreWolf
-Categories=Network;WebBrowser;
-StartupNotify=true
-Terminal=false
-X-MultipleArgs=false
-Keywords=Internet;WWW;Browser;Web;Explorer
-- 
cgit