20190116

3 files changed, 37 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 962c57cc315f..51d3d636ef00 100755
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = flat-remix-gnome
-	pkgdesc = Flat Remix GNOME theme is a pretty simple shell theme inspired on material design.
-	pkgver = 20171127
+	pkgdesc = Flat Remix GNOME theme is a pretty simple shell theme inspired on material design following a modern design using "flat" colors with high contrasts and sharp borders.
+	pkgver = 20190116
 	pkgrel = 1
-	url = https://github.com/daniruiz/Flat-Remix-GNOME-theme/
+	url = https://drasite.com/flat-remix-gnome
+	install = flat-remix-gnome.install
 	arch = any
-	groups = gnome-shell-extensions
 	license = CC-BY-SA-4.0
-	source = flat-remix-gnome::git+https://github.com/daniruiz/Flat-Remix-GNOME-theme.git
+	depends = gnome-shell
+	source = https://github.com/daniruiz/flat-remix-gnome/archive/20190116.tar.gz
 	sha256sums = SKIP
 
 pkgname = flat-remix-gnome
diff --git a/PKGBUILD b/PKGBUILD
index 3a3aebdf62d5..2513385118fc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,31 @@
-# Maintainer: Daniel Ruiz de Alegria <daniruizdealegria@gmail.com>
+# Maintainer: Daniel Ruiz de Alegría <daniel@drasite.com>
 
 pkgname="flat-remix-gnome"
-pkgver=20171127
+pkgver=20190116
 pkgrel=1
-pkgdesc="Flat Remix GNOME theme is a pretty simple shell theme inspired on material design."
+pkgdesc="Flat Remix GNOME theme is a pretty simple shell theme inspired on material design following a modern design using \"flat\" colors with high contrasts and sharp borders."
 arch=('any')
-url="https://github.com/daniruiz/Flat-Remix-GNOME-theme/"
+depends=(gnome-shell)
+install=flat-remix-gnome.install
+url="https://drasite.com/flat-remix-gnome"
 license=('CC-BY-SA-4.0')
-source=("${pkgname}::git+https://github.com/daniruiz/Flat-Remix-GNOME-theme.git")
+source=("https://github.com/daniruiz/${pkgname}/archive/${pkgver}.tar.gz")
 sha256sums=('SKIP')
 
-pkgver() {
-    cd "${pkgname}"
-    git log -1 --format="%cd" --date=short | tr -d '-'
-}
-
 package() {
-    cd "${srcdir}/${pkgname}/"
-    install -dm755 "${pkgdir}/usr/share/themes"
-    cp -a "Flat Remix"* "${pkgdir}/usr/share/themes/"
-    install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	cd "${srcdir}/${pkgname}-${pkgver}/"
+	install -dm755 "${pkgdir}/usr/share/themes"
+	cp -a Flat-Remix* "${pkgdir}/usr/share/themes/"
+	install -dm755 "${pkgdir}/usr/share/gnome-shell/theme"
+	for theme in Flat-Remix*
+	do
+		ln -s "/usr/share/themes/${theme}/gnome-shell" "${pkgdir}/usr/share/gnome-shell/theme/${theme}"
+	done
+	install -dm755 "${pkgdir}/usr/share/gnome-shell/modes"
+	cp -a src/modes/* "${pkgdir}/usr/share/gnome-shell/modes/"
+	install -dm755 "${pkgdir}/usr/share/xsessions"
+	cp -a src/sessions/xsessions/* "${pkgdir}/usr/share/xsessions/"
+	install -dm755 "${pkgdir}/usr/share/wayland-sessions"
+	cp -a src/sessions/wayland-sessions/* "${pkgdir}/usr/share/wayland-sessions/"
+	install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/flat-remix-gnome.install b/flat-remix-gnome.install
new file mode 100644
index 000000000000..f1d2875d2ebc
--- /dev/null
+++ b/flat-remix-gnome.install
@@ -0,0 +1,9 @@
+
+post_install() {
+	mv -n /usr/share/gnome-shell/gnome-shell-theme.gresource /usr/share/gnome-shell/gnome-shell-theme.gresource.old
+	ln -sf /usr/share/themes/Flat-Remix/gnome-shell-theme.gresource /usr/share/gnome-shell/gnome-shell-theme.gresource
+}
+
+post_remove() {
+	mv /usr/share/gnome-shell/gnome-shell-theme.gresource.old /usr/share/gnome-shell/gnome-shell-theme.gresource
+}