added a couple more icons

4 files changed, 65 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6b27dfaf8358..2e162b63978f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = archdroid-icon-theme-git
 	pkgdesc = Port of Android 5.0 Lollipop's material design icons to Arch.
-	pkgver = r79.4ea3b0a
+	pkgver = r85.2ae6370
 	pkgrel = 1
 	url = https://github.com/GreenRaccoon23/archdroid-icon-theme
 	install = archdroid-icon-theme.install
diff --git a/PKGBUILD b/PKGBUILD
index 52c15208155a..cbf2a94520fd 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: GreenRaccoon23 <GreenRaccoon a t gmail d o t com>
 
 pkgname=archdroid-icon-theme-git
-pkgver=r79.4ea3b0a
+pkgver=r85.2ae6370
 pkgrel=1
 pkgdesc="Port of Android 5.0 Lollipop's material design icons to Arch."
 arch=('any')
@@ -15,6 +15,12 @@ install="${pkgname%-*}.install"
 source=("git+https://github.com/GreenRaccoon23/${pkgname%-*}.git")
 md5sums=("SKIP")
 
+_error2() {
+  for e; do
+    echo "    ${e}";
+  done;
+}
+
 pkgver() {
   cd "$srcdir/${pkgname%-*}"
   ( set -o pipefail
@@ -23,9 +29,20 @@ pkgver() {
   )
 }
 
+prepare() {
+  if fc-list | grep Roboto >/dev/null; then
+    return;
+  fi;
+
+  error "Required font 'Roboto' is not installed."
+  error "Please install a font package which includes 'Roboto', such as:"
+  _error2 ttf-roboto ttf-roboto-font ttf-google-fonts-git ttf-google-fonts-hg otf-google-fonts-hg;
+  return 1;
+}
+
 package() {
-	msg2 "Installing ${pkgname%-*}..." ;
-	cd "${pkgname%-*}/${pkgname%-*}";
-  	install -dm 755 "${pkgdir}"/usr/share/icons/
-  	cp -drf --no-preserve='ownership' . "${pkgdir}"/usr/share/icons/
+  msg2 "Installing ${pkgname%-*}..." ;
+  cd "${pkgname%-*}/${pkgname%-*}";
+  install -dm 755 "${pkgdir}"/usr/share/icons/;
+  cp -drf --no-preserve='ownership' . "${pkgdir}"/usr/share/icons/;
 }
diff --git a/archdroid-icon-theme-git-r79.4ea3b0a-1.src.tar.gz b/archdroid-icon-theme-git-r79.4ea3b0a-1.src.tar.gz
deleted file mode 100644
index bd6e03327f70..000000000000
--- a/archdroid-icon-theme-git-r79.4ea3b0a-1.src.tar.gz
+++ /dev/null
diff --git a/archdroid-icon-theme.install b/archdroid-icon-theme.install
index 0f030dd835a8..31e02bc53c60 100755
--- a/archdroid-icon-theme.install
+++ b/archdroid-icon-theme.install
@@ -1,71 +1,76 @@
+_color() {
+  tput bold && tput setaf "${1}";
+  if ! [ "${2}" ]; then
+    return;
+  fi;
+  printf "%s" "${2}";
+}
+
 _green() {
-	tput bold && tput setaf 2;
-	printf "%s" "${1}";
+  _color "2" "${1}";
 }
 
 _blue() {
-	tput bold && tput setaf 4;
-	printf "%s" "${1}";
+  _color "4" "${1}";
 }
 
 _white() {
-	tput bold && tput setaf 7;
-	for line ; do
-		echo "${line}" ;
-	done ;
+  _color "7";
+  for line ; do
+    echo "${line}" ;
+  done ;
 }
 
 _msg() {
-	_green "==> ";
-	_white "$@";
-	tput sgr 0;
+  _green "==> ";
+  _white "$@";
+  tput sgr 0;
 }
 
 _msg2() {
-	_blue "  -> ";
-	_white "$@";
-	tput sgr 0;
+  _blue "  -> ";
+  _white "$@";
+  tput sgr 0;
 }
 
 _gtkUpdate() {
-	_msg "Updating icon cache"...;
+  _msg "Updating icon cache"...;
 
-	a="Archdroid";
-	colors=( Amber ArchBlue Blue BlueGrey Brown Cyan DeepOrange DeepPurple Green Grey Indigo KellyGreen LightBlue LightGreen Lime Orange Pink Purple Red Shamrock Teal Yellow );
+  a="Archdroid";
+  Colors=( 
+    Amber ArchBlue Blue BlueGrey 
+    Brown Cyan DeepOrange DeepPurple 
+    Green Grey Indigo KellyGreen 
+    LightBlue LightGreen Lime Orange 
+    Pink Purple Red Shamrock 
+    Teal Yellow 
+  );
 
-	for c in "${colors[@]}"; do
-		t="${a}-${c}";
-		d="usr/share/icons/${t}";
+  for c in "${Colors[@]}"; do
+    t="${a}-${c}";
+    d="usr/share/icons/${t}";
 
-		_msg2 "${t}";
-        gtk-update-icon-cache -ftq "${d}";
-    done ;
+    _msg2 "${t}";
+    gtk-update-icon-cache -ftq "${d}";
+  done;
 }
 
 _credits() {
-	_msg "Credits to Google, Ubuntu Mono, Mint-X, and Numix for this theme"
+  _msg "Credits to Google, Ubuntu Mono, Mint-X, and Numix for this theme";
 }
 
 post_install() {
-    _gtkUpdate;
-
-    _credits;
-
-    go=( 
-        "To enable icons for golang scripts, manually run this command:"
-        'sudo echo "text/x-go        go" | sudo tee -a /etc/mime.types' 
-       );
-    _msg "${go[@]}";
+  _gtkUpdate;
+  _credits;
 }
 
 post_upgrade() {
-    _gtkUpdate;
-    
-    _credits;
+  _gtkUpdate;
+  _credits;
 }
 
 post_remove() {
-    gtk-update-icon-cache;
+  gtk-update-icon-cache;
 }
 
 # vim: ts=2 sw=2 et: