[arch-commits] Commit in thunderbird-extension-enigmail/trunk (PKGBUILD)

[Eli Schwartz]

    Date: Sunday, July 14, 2019 @ 16:55:35
  Author: eschwartz
Revision: 489534

be more robust about an install.rdf which is, apparently, an empty dummy file

Modified:
  thunderbird-extension-enigmail/trunk/PKGBUILD

----------+
 PKGBUILD |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-07-14 16:40:28 UTC (rev 489533)
+++ PKGBUILD	2019-07-14 16:55:35 UTC (rev 489534)
@@ -45,9 +45,8 @@
     depends=('thunderbird' 'gnupg')
     cd "${srcdir}"/enigmail
 
-    if [[ -f package/install.rdf ]]; then
-        _extension_id="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' build/dist/install.rdf)"
-    else
+    if ! _extension_id="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' build/dist/install.rdf 2>/dev/null)" ||
+            [[ -z $_extension_id ]]; then
         _extension_id="$(sed -n 's/.*"id": "\(.*\)".*/\1/p' build/dist/manifest.json)"
     fi
     _extension_dest="${pkgdir}/usr/lib/thunderbird/extensions/${_extension_id}"