Package only update, incorporating recommended changes from AUR comments

4 files changed, 24 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 56bbae0b5d86..6d9a3b3e0be5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = pyfa
 	pkgdesc = EVE Online Fitting Assistant
 	pkgver = 1.36.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/pyfa-org/Pyfa
 	arch = any
-	license = GPL
+	license = GPL3
 	makedepends = unzip
 	depends = python2
 	depends = wxpython
@@ -18,9 +18,9 @@ pkgbase = pyfa
 	source = https://github.com/pyfa-org/Pyfa/releases/download/v1.36.0/pyfa-1.36.0-yc120.3-1.8-linux.zip
 	source = pyfa.desktop
 	source = pyfa-start.sh
-	md5sums = dedcbc5288c8e5b2cbb2995df1ad93cf
-	md5sums = 3c0c71b81eeff50bcf583c4f86708858
-	md5sums = 9937192cfce7f5e16e9cf26086f1899c
+	sha256sums = d44b2c2e9224c809894f173a207bf05f30bfa9f537dd4ea74a4c4c559077b5dc
+	sha256sums = 1379bd28eff6d1b658896491de580f83bf2e3921be385bdb36be88ac4b65a394
+	sha256sums = 4d6609b76edab07f08e57b1b343d4c6b5f2e836ddcad28643ba0a6cedab9dd5c
 
 pkgname = pyfa
 
diff --git a/PKGBUILD b/PKGBUILD
index 61d4da54b9de..0f1e5b8b91ea 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,34 @@
-# Maintainer: Kochetkov Andrey <gornet@gmail.com>
+# Maintainer: Simon Perry <aur [at] sanxion [dot] net>
+# Contributor: Kochetkov Andrey <gornet@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
-# Contributor: Simon Perry <aur [at] sanxion [dot] net>
 
 pkgname=pyfa
 pkgver=1.36.0
-pkgrel=1
-everelname="yc120.3"
-everelver=1.8
+pkgrel=2
+_everelname="yc120.3"
+_everelver=1.8
 pkgdesc="EVE Online Fitting Assistant"
 arch=('any')
 url="https://github.com/pyfa-org/Pyfa"
-license=('GPL')
+license=('GPL3')
 makedepends=('unzip')
 depends=('python2' 'wxpython' 'python2-sqlalchemy' 'python2-dateutil' 'python2-requests' 'python2-urllib3' 'python2-logbook')
 optdepends=('python2-matplotlib: for graph plotting'
         'python2-numpy: for graph plotting')
-source=(https://github.com/pyfa-org/Pyfa/releases/download/v$pkgver/pyfa-$pkgver-$everelname-$everelver-linux.zip pyfa.desktop pyfa-start.sh)
+source=(https://github.com/pyfa-org/Pyfa/releases/download/v$pkgver/pyfa-$pkgver-$_everelname-$_everelver-linux.zip pyfa.desktop pyfa-start.sh)
 
 package() {
-  cd "${srcdir}"/pyfa || return 1
-
-  install -d "${pkgdir}"/usr/bin || return 1
-  install -d "${pkgdir}"/usr/share/{applications,pixmaps,pyfa} || return 1
-
-  cp -R "${srcdir}"/pyfa/* "${pkgdir}"/usr/share/pyfa || return 1
+  install -dm755 "${pkgdir}"/usr/share/pyfa
+  cp -R "${srcdir}"/pyfa/* "${pkgdir}"/usr/share/pyfa
   
-  unzip -p "${srcdir}"/pyfa/imgs.zip gui/pyfa64.png > "${pkgdir}"/usr/share/pixmaps/pyfa.png || return 1
-  install -m 644 "${srcdir}"/pyfa.desktop "${pkgdir}"/usr/share/applications/pyfa.desktop || return 1
-  install "${srcdir}"/pyfa-start.sh "${pkgdir}"/usr/bin/pyfa || return 1
+  install -dm755 "${pkgdir}"/usr/share/pixmaps
+  unzip -p "${srcdir}"/pyfa/imgs.zip gui/pyfa64.png > "${pkgdir}"/usr/share/pixmaps/pyfa.png
+
+  install -Dm644 "${srcdir}"/pyfa.desktop "${pkgdir}"/usr/share/applications/pyfa.desktop
+  install -Dm755 "${srcdir}"/pyfa-start.sh "${pkgdir}"/usr/bin/pyfa
 }
 
-md5sums=('dedcbc5288c8e5b2cbb2995df1ad93cf'
-         '3c0c71b81eeff50bcf583c4f86708858'
-         '9937192cfce7f5e16e9cf26086f1899c')
+sha256sums=('d44b2c2e9224c809894f173a207bf05f30bfa9f537dd4ea74a4c4c559077b5dc'
+            '1379bd28eff6d1b658896491de580f83bf2e3921be385bdb36be88ac4b65a394'
+            '4d6609b76edab07f08e57b1b343d4c6b5f2e836ddcad28643ba0a6cedab9dd5c')
+
diff --git a/export_to_aur.sh b/export_to_aur.sh
deleted file mode 100755
index 25c13b4b6f8a..000000000000
--- a/export_to_aur.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-source PKGBUILD
-sed -i "s/^Version=.*$/Version=${pkgver}/" pyfa.desktop
-sed -i "/^md5sums=(/,/)/d" PKGBUILD 
-makepkg -g >> PKGBUILD
-mksrcinfo
-rm *linux.zip
-
-git add --all
-git commit -m "version up: $pkgver-$pkgrel"
-git push
diff --git a/pyfa-start.sh b/pyfa-start.sh
index c041715e1360..68c3f96e768b 100755
--- a/pyfa-start.sh
+++ b/pyfa-start.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 # Launch pyfa
-python2 /usr/share/pyfa/pyfa.py
+python2 /usr/share/pyfa/pyfa.py "$@"