v1.3.0

3 files changed, 96 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ad339a41c2e..37b98714a03c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,36 @@
 pkgbase = ant-gtk-theme
 	pkgdesc = Ant Theme for GTK 3.x
-	pkgver = 1.2.0
+	pkgver = 1.3.0
 	pkgrel = 1
 	url = https://www.gnome-look.org/p/1099856
 	arch = any
+	license = GPL
 	depends = gtk3
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1538595116/s/0e679a9a01e7eb0ff0f96f75fb10bdb1/t/1538888033/u/Ant.tar
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1538595153/s/0e679a9a01e7eb0ff0f96f75fb10bdb1/t/1538888033/u/Ant-Bloody.tar
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1538595136/s/0e679a9a01e7eb0ff0f96f75fb10bdb1/t/1538888033/u/Ant-Nebula.tar
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1538595173/s/0e679a9a01e7eb0ff0f96f75fb10bdb1/t/1538888033/u/Ant-Dracula.tar
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1538595170/s/0e679a9a01e7eb0ff0f96f75fb10bdb1/t/1538888033/u/Ant-Dracula-slim.tar.xz
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1538595133/s/0e679a9a01e7eb0ff0f96f75fb10bdb1/t/1538888033/u/Ant-Nebula-slim.tar.xz
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1538595150/s/0e679a9a01e7eb0ff0f96f75fb10bdb1/t/1538888033/u/Ant-Bloody-slim.tar.xz
-	source = https://dl.opendesktop.org/api/files/downloadfile/id/1538595113/s/0e679a9a01e7eb0ff0f96f75fb10bdb1/t/1538888033/u/Ant-slim.tar.xz
-	sha256sums = cf33f7507aeb4527e6541f519dba83610bd4df8f14de514251a661900594bdb3
-	sha256sums = bc41330df5f8910f8fb59f37bcafa1ab3257d8b765d87e9ccc4c4adcf9b75cba
-	sha256sums = cff53e73fc1c95591e82dbb8d5f9970beb84f837a6af5808445d2dc43a1545c9
-	sha256sums = 3fb8a299984327cd68ca345d4dfc0e5ae8f4aededa7808cca024f357359d4d06
-	sha256sums = d239ab706ad6a36807e5e37c4cca9d9045f0cb8a36268da0657dbf3e8de74573
-	sha256sums = 175db0c23142210439ec91b2ae0fb70438577122492da3a790fe5e990ea4644c
-	sha256sums = 54cd998930a90d07d2ccd1eb18b54b5e799a7dc6e1bdcdb0e2f6d6e84bb41f44
-	sha256sums = a12e49fc07b447fe406fa1652783102401199c4bd3e6e1696b30fa18cbbce76e
+	noextract = Ant.tar
+	noextract = Ant-Bloody.tar
+	noextract = Ant-Nebula.tar
+	noextract = Ant-Dracula.tar
+	noextract = Ant-Dracula-slim.tar
+	noextract = Ant-Nebula-slim.tar
+	noextract = Ant-Bloody-slim.tar
+	noextract = Ant-slim.tar
+	options = !strip
+	source = Ant.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335110/s/f22578959cfe3b80dbe895f7e28ee7ee3090989af80250f1de6d013af6591157b9975eb0d87affb1eece076a6955ff02d59c1a6160012f5e4cd2124ead552419/t/1578910153/u/Ant.tar
+	source = Ant-Bloody.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335460/s/f22578959cfe3b80dbe895f7e28ee7ee3090989af80250f1de6d013af6591157b9975eb0d87affb1eece076a6955ff02d59c1a6160012f5e4cd2124ead552419/t/1578910153/u/Ant-Bloody.tar
+	source = Ant-Nebula.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578334999/s/f22578959cfe3b80dbe895f7e28ee7ee3090989af80250f1de6d013af6591157b9975eb0d87affb1eece076a6955ff02d59c1a6160012f5e4cd2124ead552419/t/1578910153/u/Ant-Nebula.tar
+	source = Ant-Dracula.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335151/s/f22578959cfe3b80dbe895f7e28ee7ee3090989af80250f1de6d013af6591157b9975eb0d87affb1eece076a6955ff02d59c1a6160012f5e4cd2124ead552419/t/1578910153/u/Ant-Dracula.tar
+	source = Ant-Dracula-slim.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578334984/s/f22578959cfe3b80dbe895f7e28ee7ee3090989af80250f1de6d013af6591157b9975eb0d87affb1eece076a6955ff02d59c1a6160012f5e4cd2124ead552419/t/1578910153/u/Ant-Dracula-Slim.tar
+	source = Ant-Nebula-slim.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335047/s/f22578959cfe3b80dbe895f7e28ee7ee3090989af80250f1de6d013af6591157b9975eb0d87affb1eece076a6955ff02d59c1a6160012f5e4cd2124ead552419/t/1578910153/u/Ant-Nebula-Slim.tar
+	source = Ant-Bloody-slim.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578334951/s/f22578959cfe3b80dbe895f7e28ee7ee3090989af80250f1de6d013af6591157b9975eb0d87affb1eece076a6955ff02d59c1a6160012f5e4cd2124ead552419/t/1578910153/u/Ant-Bloody-Slim.tar
+	source = Ant-slim.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335024/s/f22578959cfe3b80dbe895f7e28ee7ee3090989af80250f1de6d013af6591157b9975eb0d87affb1eece076a6955ff02d59c1a6160012f5e4cd2124ead552419/t/1578910153/u/Ant-Slim.tar
+	sha512sums = 8c722ccaa3810fc8ac2b76ba02fa1c413b2335bb679e3e255438e324a152dbef894840d495fa1d8b82eb18a86f844aeb80dd112140388c1ec719472bac440a10
+	sha512sums = ac00d4b8611d8e07f60ac2c41d4f859f9f21b59b17be552756383fe7b719cdc80095fb082adcca7676c7aaf3f8eee917cb7734d29320ce518fc9e2a6a1e629cf
+	sha512sums = fdda01632aa8ef93838c7fb192e0e54a154788906e9c03fb14d6223330ebca20ead0f0a123f8638b1a14357b701bc92d939ed24f388bf4fa30daf40d7bb2bc55
+	sha512sums = eabd63acd9f7fd29d02b15fe498687f880a99367ede6518566aaee67dba41b5f109420440724a9773b2cb90fdadd0674cd0736c18e65f26718cdc1f9e9537d6d
+	sha512sums = 52db9d6ad372892db71dea359b23873c8a6990d834969401fbe6771db706fd9b76476bf44aa49f3622f431ac9d4636ac416c77702926b397bac7f0929af664bd
+	sha512sums = d5a44c87978e6ee49bfd8efc733bb9f0e9d814186443d1669cee5e0c7c3ecbb5e1f6bed657ebdfdd2868bf9b22724fb6bebd4470db9a668848f9d7e96dd06a01
+	sha512sums = e609a57b0026d0c19f18b706dd4803a0ded6380e10ab0e33c26b4fa0b4f131b582e59f2f861334c7b9854a6f9220de790608a1d1430ac71a2eeb155167edfc1b
+	sha512sums = 52bf12203615b9a703ff2cd61f89f2d5349c7684d896c22b03e2b53928f6cda0abf4f118f88dfd0c9a60149031970598b2d41be0c203da446045fe83618554e3
 
 pkgname = ant-gtk-theme
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..0ef26dbb2409
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+/src
+/pkg
+*.xz
+*.tar.*
+*.tar
+*.pkg.*
diff --git a/PKGBUILD b/PKGBUILD
index e4d0cf86706b..cf80a46c5d37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,74 @@
-# Maintainer: Michael J. Pento <mjpento@verizon.net>
+# Maintainer: Kenneth Endfinger <kaendfinger@gmail.com>
 
 pkgname=ant-gtk-theme
-pkgver=1.2.0
+pkgver=1.3.0
 pkgrel=1
 pkgdesc="Ant Theme for GTK 3.x"
-arch=(any)
+arch=('any')
+license=('GPL')
 url=https://www.gnome-look.org/p/1099856
-
+options=('!strip')
 depends=('gtk3')
 
-_hash_time=($(curl -s "$url"|grep -e "hash =" -e "timetamp ="|sed "s/.*= '\(.*\)';/\1/"))
-source=("https://dl.opendesktop.org/api/files/downloadfile/id/1538595116/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant.tar"
-	"https://dl.opendesktop.org/api/files/downloadfile/id/1538595153/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Bloody.tar"
-	"https://dl.opendesktop.org/api/files/downloadfile/id/1538595136/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Nebula.tar"
-	"https://dl.opendesktop.org/api/files/downloadfile/id/1538595173/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Dracula.tar"
-	"https://dl.opendesktop.org/api/files/downloadfile/id/1538595170/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Dracula-slim.tar.xz"
-	"https://dl.opendesktop.org/api/files/downloadfile/id/1538595133/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Nebula-slim.tar.xz"
-	"https://dl.opendesktop.org/api/files/downloadfile/id/1538595150/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Bloody-slim.tar.xz"
-	"https://dl.opendesktop.org/api/files/downloadfile/id/1538595113/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-slim.tar.xz")
+_hash_time=($(curl -s "$url"| grep -e "hash =" -e "timetamp ="| sed "s/.*= '\(.*\)';/\1/"))
+source=("Ant.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335110/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant.tar"
+	"Ant-Bloody.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335460/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Bloody.tar"
+	"Ant-Nebula.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578334999/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Nebula.tar"
+	"Ant-Dracula.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335151/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Dracula.tar"
+	"Ant-Dracula-slim.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578334984/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Dracula-Slim.tar"
+	"Ant-Nebula-slim.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335047/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Nebula-Slim.tar"
+	"Ant-Bloody-slim.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578334951/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Bloody-Slim.tar"
+	"Ant-slim.tar::https://dl.opendesktop.org/api/files/downloadfile/id/1578335024/s/${_hash_time[0]}/t/${_hash_time[1]}/u/Ant-Slim.tar")
 
-sha256sums=('cf33f7507aeb4527e6541f519dba83610bd4df8f14de514251a661900594bdb3'
-						'bc41330df5f8910f8fb59f37bcafa1ab3257d8b765d87e9ccc4c4adcf9b75cba'
-						'cff53e73fc1c95591e82dbb8d5f9970beb84f837a6af5808445d2dc43a1545c9'
-						'3fb8a299984327cd68ca345d4dfc0e5ae8f4aededa7808cca024f357359d4d06'
-						'd239ab706ad6a36807e5e37c4cca9d9045f0cb8a36268da0657dbf3e8de74573'
-						'175db0c23142210439ec91b2ae0fb70438577122492da3a790fe5e990ea4644c'
-						'54cd998930a90d07d2ccd1eb18b54b5e799a7dc6e1bdcdb0e2f6d6e84bb41f44'
-						'a12e49fc07b447fe406fa1652783102401199c4bd3e6e1696b30fa18cbbce76e')
+noextract=('Ant.tar'
+           'Ant-Bloody.tar'
+           'Ant-Nebula.tar'
+           'Ant-Dracula.tar'
+           'Ant-Dracula-slim.tar'
+           'Ant-Nebula-slim.tar'
+           'Ant-Bloody-slim.tar'
+           'Ant-slim.tar'
+)
 
-package() {
-	cd ${srcdir}
-	find Ant{,-Bloody,-Dracula,-Nebula}/ -type f -exec install -Dm644 '{}' "${pkgdir}/usr/share/themes/{}" \;
+sha512sums=('8c722ccaa3810fc8ac2b76ba02fa1c413b2335bb679e3e255438e324a152dbef894840d495fa1d8b82eb18a86f844aeb80dd112140388c1ec719472bac440a10'
+            'ac00d4b8611d8e07f60ac2c41d4f859f9f21b59b17be552756383fe7b719cdc80095fb082adcca7676c7aaf3f8eee917cb7734d29320ce518fc9e2a6a1e629cf'
+            'fdda01632aa8ef93838c7fb192e0e54a154788906e9c03fb14d6223330ebca20ead0f0a123f8638b1a14357b701bc92d939ed24f388bf4fa30daf40d7bb2bc55'
+            'eabd63acd9f7fd29d02b15fe498687f880a99367ede6518566aaee67dba41b5f109420440724a9773b2cb90fdadd0674cd0736c18e65f26718cdc1f9e9537d6d'
+            '52db9d6ad372892db71dea359b23873c8a6990d834969401fbe6771db706fd9b76476bf44aa49f3622f431ac9d4636ac416c77702926b397bac7f0929af664bd'
+            'd5a44c87978e6ee49bfd8efc733bb9f0e9d814186443d1669cee5e0c7c3ecbb5e1f6bed657ebdfdd2868bf9b22724fb6bebd4470db9a668848f9d7e96dd06a01'
+            'e609a57b0026d0c19f18b706dd4803a0ded6380e10ab0e33c26b4fa0b4f131b582e59f2f861334c7b9854a6f9220de790608a1d1430ac71a2eeb155167edfc1b'
+            '52bf12203615b9a703ff2cd61f89f2d5349c7684d896c22b03e2b53928f6cda0abf4f118f88dfd0c9a60149031970598b2d41be0c203da446045fe83618554e3')
 
-	# break out '-Slim' and '-standard-buttons' sub-dirs
-	cp -r "${srcdir}/Ant-slim/Ant-Slim" "${pkgdir}/usr/share/themes/"
-	cp -r "${srcdir}/Ant-slim/Ant-Slim-Standard-Buttons" "${pkgdir}/usr/share/themes/"
-	cp -r "${srcdir}/Ant-Bloody-slim/Ant-Bloody-Slim" "${pkgdir}/usr/share/themes/"
-	cp -r "${srcdir}/Ant-Bloody-slim/Ant-Bloody-slim-standard-buttons" "${pkgdir}/usr/share/themes/"
-	cp -r "${srcdir}/Ant-Dracula-slim/Ant-Dracula-Slim" "${pkgdir}/usr/share/themes/"
-	cp -r "${srcdir}/Ant-Dracula-slim/Ant-Dracula-slim-standard-buttons" "${pkgdir}/usr/share/themes/"
-	cp -r "${srcdir}/Ant-Nebula-slim/Ant-Nebula-Slim" "${pkgdir}/usr/share/themes/"
-	cp -r "${srcdir}/Ant-Nebula-slim/Ant-Nebula-slim-standard-buttons" "${pkgdir}/usr/share/themes/"
+prepare() {
+  cd "${srcdir}"
+  for THEME_FILE in "${noextract[@]}"
+  do
+    THEME_NAME="${THEME_FILE%.*}"
+    mkdir -p "${THEME_NAME}"
+    if echo "${THEME_FILE}" | grep "slim" > /dev/null
+    then
+      bsdtar xf "${THEME_FILE}" -C "${THEME_NAME}"
+      cd "${THEME_NAME}"
+      for SUB_THEME_FILE in $(find . -type f -name '*.tar')
+      do
+        SUB_THEME_NAME=$(basename "${SUB_THEME_FILE}")
+        SUB_THEME_NAME="${SUB_THEME_NAME%.*}"
+        mkdir -p "${SUB_THEME_NAME}"
+        bsdtar xf "${SUB_THEME_FILE}" --strip-components=1 -C "${SUB_THEME_NAME}"
+      done
+      cd ..
+    else
+      bsdtar xf "${THEME_FILE}" --strip-components=1 -C "${THEME_NAME}"
+    fi
+  done
+}
+
+package() {
+  mkdir -p "${pkgdir}/usr/share/themes"
+  for THEME_INDEX_FILE in $(find "${srcdir}" -type f -name 'index.theme')
+  do
+    THEME_SRC_DIR=$(dirname "${THEME_INDEX_FILE}")
+    THEME_NAME=$(basename "${THEME_SRC_DIR}")
+    cp -r "${THEME_SRC_DIR}" "${pkgdir}/usr/share/themes"
+  done
 }