Upstream update

2 files changed, 6 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80c0b62ca9e6..ddd062f3b3bd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = canta-theme-git
 	pkgdesc = Flat Material Design theme for GTK 3, GTK 2 and Gnome-Shell
-	pkgver = 2018_05_15.r10.0290e7d
+	pkgver = 2018.10.01.r0.c729be1
 	pkgrel = 1
 	url = https://github.com/vinceliuice/Canta-theme
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 33f6b7975b1e..e991d2b13761 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@ pkgbase=canta-theme-git
 _pkgname=canta-theme
 pkgname=('canta-gtk-theme-git' 'canta-icon-theme-git')
 pkgdesc="Flat Material Design theme for GTK 3, GTK 2 and Gnome-Shell"
-pkgver=2018_05_15.r10.0290e7d
+pkgver=2018.10.01.r0.c729be1
 pkgrel=1
 arch=('any')
 url="https://github.com/vinceliuice/Canta-theme"
@@ -24,37 +24,15 @@ pkgver() {
     git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g'
 }
 
-build() {
-    cd "${srcdir}/${_pkgname}"
-    
-    # Build GTK theme
-    #patch -Np1 < "${srcdir}"/installer.patch
-    
-    sed \
-        -e "/ROOT_UID=0/d" \
-        -e "/DEST_DIR=/d" \
-        -e '/# Destination directory/d' \
-        -e "/if \[ \"\$UID\" -eq \"\$ROOT_UID\" \]; then/d" \
-        -e "/DEST_DIR=\"\/usr\/share\/themes\"/d" \
-        -e "/else/d" \
-        -e "/DEST_DIR=\"\$HOME\/.themes\"/d" \
-        -e "0,/fi/d" -i $srcdir/canta-theme/install.sh
-
-    rm -rf build
-    mkdir build
-    #DEST_DIR=build ./install.sh
-    DEST_DIR=build ./Install_with_background_img
-}
-
 package_canta-gtk-theme-git() {
-    mkdir -p "${pkgdir}"/usr/share/themes/
-    cp "${srcdir}"/${_pkgname}/build/* "${pkgdir}"/usr/share/themes/ -R
+  cd "${srcdir}/${_pkgname}"
+  mkdir -p "${pkgdir}/usr/share/themes"
+  ./install.sh -b -d "${pkgdir}/usr/share/themes"
 }
 
 package_canta-icon-theme-git() {
     pkgdesc="Flat icons for Canta GTK theme"
-    
+
     mkdir -p "${pkgdir}"/usr/share/icons/Canta
     cp "${srcdir}"/${_pkgname}/src/icons/Canta/* "${pkgdir}"/usr/share/icons/Canta -R
 }
-