Improved PKGBUILD

1 files changed, 6 insertions, 1 deletions

diff --git a/PKGBUILD b/PKGBUILD
index fc91b7724f02..eaed7da1c289 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,6 +5,7 @@ _plugin_name='restartless-restart'
 _plugin_no='249342'
 pkgname="firefox-extension-${_plugin_name}"
 _filever='9'
+_applist='sm+fx+tb+fn'
 pkgver='9.1'
 pkgrel='1'
 pkgdesc='add a File -> Restart menu item and a ctrl/cmd + alt + r hotkey to restart Firefox or Seamonkey'
@@ -13,13 +14,17 @@ url="https://addons.mozilla.org/firefox/addon/${_plugin_name}/"
 license=('MIT')
 depends=('firefox')
 _verwatch=("https://addons.mozilla.org/en-us/firefox/addon/${_plugin_name}/versions/" '\s\+Version \([0-9\.]\+\)-signed</a>' 'f')
-source=("https://addons.cdn.mozilla.net/user-media/addons/${_plugin_no}/${_plugin_name//-/_}-${_filever}-sm+fx+tb+fn.xpi")
+#source=("https://addons.mozilla.org/firefox/downloads/file/${_plugin_no}/${_plugin_name//-/_}-${_filever}-${_applist}.xpi")
+source=("https://addons.cdn.mozilla.net/user-media/addons/${_plugin_no}/${_plugin_name//-/_}-${_filever}-${_applist}.xpi")
 sha256sums=('17ac1ecf8d6d6c2525d866a01ba8cecf78e9ccffb4327a940c9df907cf3ae774')
 
 package() {
   set -u
   local _emid="$(sed -n -e 's:^    <id>\(.*\)</id>.*$:\1:p' 'install.rdf')"
+  #local _emid="$(sed -n -e 's@^\s\+<em:id>\({[a-fA-F0-9-]\+}\)</em:id>.*$@\1@p' 'install.rdf' | head -1)"
+  test ! -z "${_emid}"
   local _file=(*.xpi)
+  test "${#_file[@]}" -eq 1
   install -Dpm644 "${_file}" "${pkgdir}/usr/lib/firefox/browser/extensions/${_emid}.xpi"
   set +u
 }