updated PKGBUILD with new packaging from https-everywhere.

Now works with firefox signing

2 files changed, 21 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0b219856b466..4cd6b7182e3c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Feb 18 20:22:49 UTC 2016
+# Wed Feb 24 17:56:29 UTC 2016
 pkgbase = firefox-extension-foxyproxy
 	pkgdesc = FoxyProxy is an advanced proxy management tool that completely replaces Firefox's limited proxying capabilities.
 	pkgver = 4.5.6
-	pkgrel = 2
+	pkgrel = 3
 	url = https://addons.mozilla.org/firefox/addon/2464
 	arch = any
 	license = GPL
diff --git a/PKGBUILD b/PKGBUILD
index 228642c2185d..12c215c6e2d3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,22 +3,35 @@
 _plugin_name=foxyproxy
 _plugin_version=4.5.6
 _plugin_id=2464
+_plugin_ext="-fx+sm+tb"
 pkgdesc="FoxyProxy is an advanced proxy management tool that completely replaces Firefox's limited proxying capabilities."
 license=('GPL')
 
 pkgname=firefox-extension-$_plugin_name
 pkgver=$_plugin_version
-pkgrel=2
+pkgrel=3
 arch=('any')
 url="https://addons.mozilla.org/firefox/addon/$_plugin_id"
 depends=("firefox")
-source=("https://addons.cdn.mozilla.net/user-media/addons/2464/foxyproxy_standard-${pkgver}-fx+sm+tb.xpi")
+source=("https://addons.cdn.mozilla.net/user-media/addons/2464/foxyproxy_standard-${pkgver}${_plugin_ext}.xpi")
 sha256sums=('9a9309c1cc3508b145937cccc1048668bb292fb8c1ca5c5ceb73f4405a232a24')
 
-package() {
+prepare() {
   cd "$srcdir"
-  local emid=$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' install.rdf)
-  local dstdir="$pkgdir/usr/lib/firefox/browser/extensions/$emid"
-  find . -type f -exec install -Dm644 '{}' "$dstdir/{}" \;
+  unzip -qqo "${_plugin_name}_standard-${pkgver}${_plugin_ext}.xpi" -d "${_plugin_name}-${pkgver}"
 }
 
+package() {
+  cd "${srcdir}"
+
+  _extension_id="$(sed -n '/.*<em:id>\(.*\)<\/em:id>.*/{s//\1/p;q}' ${_plugin_name}-${pkgver}/install.rdf)"
+  _extension_dest="${pkgdir}/usr/lib/firefox/browser/extensions/${_extension_id}"
+  # Should this extension be unpacked or not?
+  if grep '<em:unpack>true</em:unpack>' ${_plugin_name}-${pkgver}/install.rdf > /dev/null; then
+    install -dm755 "${_extension_dest}"
+    cp -R ${_plugin_name}-${pkgver}/* "${_extension_dest}"
+    chmod -R ugo+rX "${_extension_dest}"
+  else
+    install -Dm644 ${_plugin_name}_standard-${pkgver}${_plugin_ext}.xpi "${_extension_dest}${_plugin_ext}.xpi"
+  fi
+}