Code cleaning

2 files changed, 21 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5e267d2cbf35..99ae4d58c4af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,20 @@
+# Generated by mksrcinfo v8
+# Sun Feb 28 16:58:59 UTC 2016
 pkgbase = nixnote
-	pkgdesc = Formerly called nevernote, nixnote is a clone of Evernote designed to run on Linux.
+	pkgdesc = Formerly called nevernote, nixnote is a clone of Evernote designed to run on Linux
 	pkgver = 1.6
 	pkgrel = 1
-	url = http://www.sourceforge.net/projects/nevernote/
+	url = http://www.sourceforge.net/projects/nevernote
 	arch = x86_64
 	arch = i686
-	license = GPL
+	license = GPL2
 	depends = java-runtime
 	depends = libpng12
-	source = http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/NixNote%201.6/nixnote-1.6_amd64.tar.gz
-	sha256sums = 781f8b9cbe3e1137b62d4dbb76670b3e2d5a20403b04b3767e03a2e89dba860e
+	conflicts = nixnote-beta
+	source_x86_64 = http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/NixNote%201.6/nixnote-1.6_amd64.tar.gz
+	sha256sums_x86_64 = 781f8b9cbe3e1137b62d4dbb76670b3e2d5a20403b04b3767e03a2e89dba860e
+	source_i686 = http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/NixNote%201.6/nixnote-1.6_i386.tar.gz
+	sha256sums_i686 = 50be711e33d37fd43590845718e5e5710cc48a5f7f745df8990b0f792da3a7da
 
 pkgname = nixnote
 
diff --git a/PKGBUILD b/PKGBUILD
index 8406acb9a6be..37da557b885b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,25 +7,18 @@ pkgname=nixnote
 pkgver=1.6
 _pkgver='NixNote%201.6'
 pkgrel=1
-pkgdesc="Formerly called nevernote, nixnote is a clone of Evernote designed to run on Linux."
-url="http://www.sourceforge.net/projects/nevernote/"
+pkgdesc="Formerly called nevernote, nixnote is a clone of Evernote designed to run on Linux"
+url="http://www.sourceforge.net/projects/nevernote"
 arch=('x86_64' 'i686')
-_arch='amd64'
-license=('GPL')
+license=('GPL2')
 depends=('java-runtime' 'libpng12')
-sha256sums=('781f8b9cbe3e1137b62d4dbb76670b3e2d5a20403b04b3767e03a2e89dba860e')
+conflicts=('nixnote-beta')
+source_x86_64=("http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/${_pkgver}/${pkgname}-${pkgver}_amd64.tar.gz")
+sha256sums_x86_64=('781f8b9cbe3e1137b62d4dbb76670b3e2d5a20403b04b3767e03a2e89dba860e')
+source_i686=("http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/${_pkgver}/${pkgname}-${pkgver}_i386.tar.gz")
+sha256sums_i686=('50be711e33d37fd43590845718e5e5710cc48a5f7f745df8990b0f792da3a7da')
 
-if [ "$CARCH" = 'i686' ]; then
-  _arch='i386'
-  sha256sums=('50be711e33d37fd43590845718e5e5710cc48a5f7f745df8990b0f792da3a7da')
-fi;
-
-source=("http://download2.polytechnic.edu.na/pub4/sourceforge/n/project/project/ne/nevernote/${_pkgver}/${pkgname}-${pkgver}_${_arch}.tar.gz")
-
-package()
-{
-	cp -R "${srcdir}/nixnote/usr" "${pkgdir}/"
-	mv "${pkgdir}/usr/bin/nixnote.sh" "${pkgdir}/usr/bin/nixnote"
+package() {
+    cp -R "${srcdir}/nixnote/usr" "${pkgdir}/"
+    mv "${pkgdir}/usr/bin/nixnote.sh" "${pkgdir}/usr/bin/nixnote"
 }
-
-# vim:set ts= 2 sw=2 Et: