icons correction + gtk-update-icon-cache

4 files changed, 23 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fc59457303f2..76b18dff7c39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sat Feb 13 13:34:19 UTC 2016
+# Sun Feb 14 02:19:32 UTC 2016
 pkgbase = gnome-shell-extension-shellshape-git
 	pkgdesc = Tiling window manager extension for gnome-shell.
 	pkgver = r306.839fe66
-	pkgrel = 1
+	pkgrel = 2
 	url = http://gfxmonk.net/shellshape
 	install = gnome-shell-extension-shellshape-git.install
 	arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 8805004edffe..3815cbfce296 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Fabien JUIF <fabien.juif@gmail.com>
-application=shellshape
-pkgname=gnome-shell-extension-${application}-git
-pkgrel=1
+_application=shellshape
+pkgname=gnome-shell-extension-${_application}-git
+pkgrel=2
 pkgver=r306.839fe66
 license=('GPL3')
 pkgdesc="Tiling window manager extension for gnome-shell."
@@ -11,49 +11,49 @@ depends=('gnome-shell')
 makedepends=('git' 'npm')
 install=${pkgname}.install
 source=(
-  "git+https://github.com/timbertson/${application}"
+  "git+https://github.com/timbertson/${_application}"
 )
 sha256sums=(
   'SKIP'
 )
 
 build() {
-  cd ${srcdir}/${application}
-  build_dir=${srcdir}/${application}/${application}
+  cd ${srcdir}/${_application}
+  build_dir=${srcdir}/${_application}/${_application}
 
   # build it
   make
 }
 
 package() {
-  build_dir=${srcdir}/${application}/${application}
+  build_dir=${srcdir}/${_application}/${_application}
 
   # directories architecture
   mkdir -p ${pkgdir}/usr/share/gnome-shell/extensions/shellshape@gfxmonk.net
-  mkdir -p ${pkgdir}/usr/share/icons
+  mkdir -p ${pkgdir}/usr/share/icons/hicolor/scalable
   mkdir -p ${pkgdir}/usr/share/glib-2.0/schemas
 
   # copies
   # - extension
   dest_dir="${pkgdir}/usr/share/gnome-shell/extensions/shellshape@gfxmonk.net"
-  cp ${srcdir}/${application}/build/gjs/*.js ${dest_dir}/
+  cp ${srcdir}/${_application}/build/gjs/*.js ${dest_dir}/
   cp ${build_dir}/metadata.json ${dest_dir}/
   cp ${build_dir}/shellshape.pot ${dest_dir}/
   cp -R ${build_dir}/lib ${dest_dir}/
 
-  # Locales
+  # - locales
   cp -R ${build_dir}/locale ${pkgdir}/usr/share/locale
 
-  # Glib-2.0
-  cp ${srcdir}/${application}/schemas/*.xml ${pkgdir}/usr/share/glib-2.0/schemas/
+  # - glib-2.0
+  cp ${srcdir}/${_application}/schemas/*.xml ${pkgdir}/usr/share/glib-2.0/schemas/
 
-  # Icons
-  cp -R ${srcdir}/${application}/icons ${pkgdir}/usr/share/icons
+  # - icons
+  cp -R ${srcdir}/${_application}/icons/status ${pkgdir}/usr/share/icons/hicolor/scalable
 
 }
 
 pkgver() {
-  cd ${application}
+  cd ${_application}
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
diff --git a/gnome-shell-extension-shellshape-git.install b/gnome-shell-extension-shellshape-git.install
index 326aa98a2f02..c0ed9a0d79f8 100644
--- a/gnome-shell-extension-shellshape-git.install
+++ b/gnome-shell-extension-shellshape-git.install
@@ -1,5 +1,6 @@
 post_install() {
   glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
 }
 
 post_upgrade() {
diff --git a/makefile b/makefile
index 1dd49b2aa3d0..b5dc143bbd63 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-all: clean main install
+all: clean main lint install
 
 clean:
 	rm -Rf pkg
@@ -6,6 +6,10 @@ clean:
 	rm -Rf shellshape
 	rm -Rf *shellshape-git-*.pkg.tar.xz
 
+lint:
+	namcap PKGBUILD
+	namcap *shellshape-git-*.pkg.tar.xz
+
 main:
 	makepkg
 	mksrcinfo