Update to 2.7.3, use HTTPS, remove unneeded extraction, fix executable permissions, and clean up package()

2 files changed, 14 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e7aac6c00fd6..a2066c3b5a99 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = worldpainter
 	pkgdesc = An interactive map generator for Minecraft
-	pkgver = 2.7.0
+	pkgver = 2.7.3
 	pkgrel = 1
 	url = https://www.worldpainter.net/
 	arch = x86_64
@@ -9,11 +9,11 @@ pkgbase = worldpainter
 	depends = lib32-libxi
 	depends = sh
 	optdepends = minecraft: for playing the exported maps
-	source = http://www.worldpainter.net/files/worldpainter_2.7.0.tar.gz
+	source = https://www.worldpainter.net/files/worldpainter_2.7.3.tar.gz
 	source = worldpainter.png
 	source = worldpainter.desktop
 	source = launch-script
-	sha256sums = 91688b4e1363aaba816474536bf41fe4ccce2f6d1b6bea9fe94baac373962c5f
+	sha256sums = c61934a0c2e186cbbd6dd7505a71f965eeea4947fd992e7a7340d430272fcba6
 	sha256sums = a93cd4af0e8ef470f48a8dd2773fb9d83a5302f1b9bfba67f43b4ec7500a039e
 	sha256sums = 669f78518b75b441f4382cfd14e207dd91ee1dc967383db1771ec202dbb07cb4
 	sha256sums = fd64d11450f03c8924cbc133a009b3373bc5f80b2589b63391b65db04d82963f
diff --git a/PKGBUILD b/PKGBUILD
index 3ff389f8a836..20da450d0264 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Contributor: Dirk Sohler <spam@0x7be.de>               
 # Contributor: Hunter Jones <hjones2199 at gmail dot com>
-# Maintainer: Thomas Bork <tab dot epic at gmail dot com>
+# Maintainer: Thomas Bork <sudobash418 at gmail dot com>
 pkgname=worldpainter
-pkgver=2.7.0
+pkgver=2.7.3
 pkgrel=1
 pkgdesc='An interactive map generator for Minecraft'
 
@@ -13,35 +13,28 @@ license=('GPL')
 depends=('java-environment' 'lib32-libxi' 'sh')
 optdepends=('minecraft: for playing the exported maps')
 
-source=("http://www.worldpainter.net/files/${pkgname}_${pkgver}.tar.gz"
+source=("https://www.worldpainter.net/files/${pkgname}_${pkgver}.tar.gz"
 		'worldpainter.png'
 		'worldpainter.desktop'
 		'launch-script')
-sha256sums=('91688b4e1363aaba816474536bf41fe4ccce2f6d1b6bea9fe94baac373962c5f'
+sha256sums=('c61934a0c2e186cbbd6dd7505a71f965eeea4947fd992e7a7340d430272fcba6'
             'a93cd4af0e8ef470f48a8dd2773fb9d83a5302f1b9bfba67f43b4ec7500a039e'
             '669f78518b75b441f4382cfd14e207dd91ee1dc967383db1771ec202dbb07cb4'
             'fd64d11450f03c8924cbc133a009b3373bc5f80b2589b63391b65db04d82963f')
 
 package() {
-	cd "${srcdir}"
-	tar xf "worldpainter_${pkgver}.tar.gz"
+	cd "${srcdir}/${pkgname}"
 
 	install -dm755 "${pkgdir}/opt/worldpainter/"{bin,lib,.install4j}
 	install -dm755 "${pkgdir}/usr/share/"{pixmaps,applications}
 
-	install -Dm644 "${srcdir}/$pkgname/bin/"* "${pkgdir}/opt/$pkgname/bin/"
-
-	install -Dm644 "${srcdir}/$pkgname/lib/"* "${pkgdir}/opt/$pkgname/lib/"
-
-	install -Dm644 "${srcdir}/$pkgname/"*.vmoptions "${pkgdir}/opt/$pkgname/"
-
-	install -Dm755 "${srcdir}/$pkgname/worldpainter" "${pkgdir}/opt/$pkgname/"
-
-	install -Dm755 "${srcdir}/$pkgname/.install4j/"* "${pkgdir}/opt/$pkgname/.install4j"
-
-	install -Dm755 "${srcdir}/worldpainter.png" "${pkgdir}/usr/share/pixmaps/"
+	install -Dm644 bin/*        "${pkgdir}/opt/${pkgname}/bin/"
+	install -Dm644 lib/*        "${pkgdir}/opt/${pkgname}/lib/"
+	install -Dm644 *.vmoptions  "${pkgdir}/opt/${pkgname}/"
+	install -Dm755 worldpainter "${pkgdir}/opt/${pkgname}/"
+	install -Dm755 .install4j/* "${pkgdir}/opt/${pkgname}/.install4j"
 
+	install -Dm644 "${srcdir}/worldpainter.png" "${pkgdir}/usr/share/pixmaps/"
 	install -Dm755 "${srcdir}/launch-script" "${pkgdir}/usr/bin/worldpainter"
-
 	install -Dm644 "${srcdir}/worldpainter.desktop" "${pkgdir}/usr/share/applications/worldpainter.desktop"
 }