cleaner PKGBUILD, added desktop icon (issued/requested by https://aur.archlinux.org/account/caltlgin)

2 files changed, 23 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 11d9de7ef8a6..ed9617dbafde 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = micro-bin
 	pkgdesc = A modern and intuitive terminal-based text editor
 	pkgver = 2.0.5
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/zyedidia/micro
 	arch = x86_64
 	arch = i686
@@ -11,18 +11,16 @@ pkgbase = micro-bin
 	conflicts = micro-git
 	conflicts = micro
 	conflicts = micro-nightly-bin
+	source = https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.1
+	source = https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.desktop
+	source = micro.svg::https://micro-editor.github.io/micro_files/micro-logo-mark.svg
+	sha256sums = e753edc9899152ab1c70926b8f096d0bdcd1efa9213dd27fcef2e0b85236153e
+	sha256sums = 3fd83fda3c2a6711edbc5e4158db5ba0898e8b59760d30f8e3bce7642e071be7
+	sha256sums = 88686fe20569951f401191c0cf232e1d4a915b549137127681b7b1c5a9c30a2b
 	source_x86_64 = https://github.com/zyedidia/micro/releases/download/v2.0.5/micro-2.0.5-linux64.tar.gz
-	source_x86_64 = https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.1
-	source_x86_64 = https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.desktop
 	sha256sums_x86_64 = 4f159a4b8a08c48559bd94b3aacdca9a6188af0f9919fec61e01dde44f0f4fa0
-	sha256sums_x86_64 = e753edc9899152ab1c70926b8f096d0bdcd1efa9213dd27fcef2e0b85236153e
-	sha256sums_x86_64 = 3fd83fda3c2a6711edbc5e4158db5ba0898e8b59760d30f8e3bce7642e071be7
 	source_i686 = https://github.com/zyedidia/micro/releases/download/v2.0.5/micro-2.0.5-linux32.tar.gz
-	source_i686 = https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.1
-	source_i686 = https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.desktop
 	sha256sums_i686 = 6b60ca069e9b28d1d8ddb3d70a191bab8a588b5eb8903b1fab794789521bf37d
-	sha256sums_i686 = e753edc9899152ab1c70926b8f096d0bdcd1efa9213dd27fcef2e0b85236153e
-	sha256sums_i686 = 3fd83fda3c2a6711edbc5e4158db5ba0898e8b59760d30f8e3bce7642e071be7
 
 pkgname = micro-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index bc2227f1cd4f..c12b603c0262 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Previous Contributor: blainester <theblainestory at gmail com>
 pkgname=micro-bin
 pkgver=2.0.5
-pkgrel=2
+pkgrel=3
 pkgdesc="A modern and intuitive terminal-based text editor"
 arch=('x86_64' 'i686')
 url="https://github.com/zyedidia/micro"
@@ -14,19 +14,21 @@ optdepends=('xclip: Required for copying/pasting text')
 conflicts=('micro-git' 'micro' 'micro-nightly-bin')
 provides=('micro')
 
-source_x86_64=("https://github.com/zyedidia/micro/releases/download/v${pkgver}/micro-${pkgver}-linux64.tar.gz"
-				"https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.1"
-				"https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.desktop")
-source_i686=("https://github.com/zyedidia/micro/releases/download/v${pkgver}/micro-${pkgver}-linux32.tar.gz"
-				"https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.1"
-				"https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.desktop")
+source_x86_64=("https://github.com/zyedidia/micro/releases/download/v${pkgver}/micro-${pkgver}-linux64.tar.gz")
+			# "https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.1"
+			# "https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.desktop")
+source_i686=("https://github.com/zyedidia/micro/releases/download/v${pkgver}/micro-${pkgver}-linux32.tar.gz")
+			# "https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.1"
+			# "https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.desktop")
+source=("https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.1"
+			"https://raw.githubusercontent.com/zyedidia/micro/master/assets/packaging/micro.desktop"
+			"micro.svg::https://micro-editor.github.io/micro_files/micro-logo-mark.svg")
 
-sha256sums_x86_64=('4f159a4b8a08c48559bd94b3aacdca9a6188af0f9919fec61e01dde44f0f4fa0'
-                   'e753edc9899152ab1c70926b8f096d0bdcd1efa9213dd27fcef2e0b85236153e'
-                   '3fd83fda3c2a6711edbc5e4158db5ba0898e8b59760d30f8e3bce7642e071be7')
-sha256sums_i686=('6b60ca069e9b28d1d8ddb3d70a191bab8a588b5eb8903b1fab794789521bf37d'
-                 'e753edc9899152ab1c70926b8f096d0bdcd1efa9213dd27fcef2e0b85236153e'
-                 '3fd83fda3c2a6711edbc5e4158db5ba0898e8b59760d30f8e3bce7642e071be7')
+sha256sums=('e753edc9899152ab1c70926b8f096d0bdcd1efa9213dd27fcef2e0b85236153e'
+            '3fd83fda3c2a6711edbc5e4158db5ba0898e8b59760d30f8e3bce7642e071be7'
+            '88686fe20569951f401191c0cf232e1d4a915b549137127681b7b1c5a9c30a2b')
+sha256sums_x86_64=('4f159a4b8a08c48559bd94b3aacdca9a6188af0f9919fec61e01dde44f0f4fa0')
+sha256sums_i686=('6b60ca069e9b28d1d8ddb3d70a191bab8a588b5eb8903b1fab794789521bf37d')
 
 package(){
  install -Dm755 "${srcdir}/${pkgname%-*}-${pkgver}/${pkgname%-*}" "${pkgdir}/usr/bin/${pkgname%-*}"
@@ -37,4 +39,5 @@ package(){
  done
  install -Dm644 "${srcdir}/micro.1" "${pkgdir}/usr/share/man/man1/micro.1"
  install -Dm644 "${srcdir}/micro.desktop" "${pkgdir}/usr/share/applications/micro.desktop"
+ install -Dm644 "${srcdir}/micro.svg" "${pkgdir}/usr/share/pixmaps/micro.svg"
 }