Clean up install.

2 files changed, 14 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bc193ed58230..5a6005f596a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gnome-shell-extension-arch-update
 	pkgdesc = Convenient indicator for Arch Linux updates in GNOME Shell.
 	pkgver = 27
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/RaphaelRochet/arch-update
 	arch = any
 	license = GPL3
diff --git a/PKGBUILD b/PKGBUILD
index 910683e0e0cf..04ddd61b4508 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=gnome-shell-extension-arch-update
 pkgver=27
-pkgrel=1
+pkgrel=2
 pkgdesc="Convenient indicator for Arch Linux updates in GNOME Shell."
 arch=('any')
 url="https://github.com/RaphaelRochet/arch-update"
@@ -15,10 +15,17 @@ sha512sums=('aedb0f6b710333d9c5bc474265ad17e181608141e8e2ada504a1f13334bd01abaf2
 
 
 package() {
-  _uuid='arch-update@RaphaelRochet'
-  _install_dir="${pkgdir}/usr/share/gnome-shell/extensions/${_uuid}"
-
-  install -dm655 $_install_dir
   cd "arch-update-${pkgver}"
-  cp -r * $_install_dir
+  # Locate the extension.
+  _extname=$(grep -Po '(?<="uuid": ")[^"]*' metadata.json)
+  _destdir="${pkgdir}/usr/share/gnome-shell/extensions/${_extname}"
+  # Copy extension files into place.
+  find -maxdepth 1 \( -iname '*.js*' -or -iname '*.css' -or -iname '*.ui' \) -exec install -Dm644 -t "${_destdir}" '{}' +
+  find -maxdepth 2 \( -iname '*.svg*' \) -exec install -Dm644 -t "${_destdir}/icons" '{}' +
+  find -name '*.xml' -exec install -Dm644 -t "${pkgdir}/usr/share/glib-2.0/schemas/" '{}' +
+  cd locale
+  for locale in */
+    do
+      install -Dm644 -t "${_destdir}/locale/${locale}/LC_MESSAGES" "${locale}/LC_MESSAGES"/*.mo
+    done
 }