summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsudoBash4182023-06-11 22:55:25 -0600
committersudoBash4182023-06-11 22:55:25 -0600
commit18b7564f9eeaf6162d6dfee79807b1dcd8032321 (patch)
tree686423e4beecece19ed97242e783faf4042a8b28
parent6650997be85ce4f56bd04b4dc46eca69fbeb17d5 (diff)
downloadaur-18b7564f9eeaf6162d6dfee79807b1dcd8032321.tar.gz
Update to 2.18.0; improve launch script
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
-rw-r--r--launch-script3
-rw-r--r--launch-script.sh7
4 files changed, 17 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f9aba3dd4365..e6e155cc87ad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = worldpainter
pkgdesc = An interactive map generator for Minecraft
- pkgver = 2.17.2
+ pkgver = 2.18.0
pkgrel = 1
url = https://www.worldpainter.net/
arch = x86_64
@@ -9,13 +9,13 @@ pkgbase = worldpainter
depends = lib32-libxi
depends = sh
optdepends = minecraft: for playing the exported maps
- source = https://www.worldpainter.net/files/worldpainter_2.17.2.tar.gz
+ source = https://www.worldpainter.net/files/worldpainter_2.18.0.tar.gz
source = worldpainter.png
source = worldpainter.desktop
- source = launch-script
- sha256sums = 9872d8224bcd27bc1657f47f7911028bada017e0bd7f1154176d65bf71a1b05f
+ source = launch-script.sh
+ sha256sums = 975dadb205eb91f057ee8b2944c7324250cebba6c2c7b255a0bf83e1b5dfd9bf
sha256sums = a93cd4af0e8ef470f48a8dd2773fb9d83a5302f1b9bfba67f43b4ec7500a039e
sha256sums = 815abfee2eb545a3bac0d2e4e5c0cadc548cc1466c4e0aaf3bfd1f07a15e7741
- sha256sums = fd64d11450f03c8924cbc133a009b3373bc5f80b2589b63391b65db04d82963f
+ sha256sums = 631cffdb102945a39b28ec33567acd350c3ae5b000face915d24159741942fd0
pkgname = worldpainter
diff --git a/PKGBUILD b/PKGBUILD
index c521ae880da4..e62280690de0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Hunter Jones <hjones2199 at gmail dot com>
# Maintainer: Thomas Bork <sudobash418 at gmail dot com>
pkgname=worldpainter
-pkgver=2.17.2
+pkgver=2.18.0
pkgrel=1
pkgdesc='An interactive map generator for Minecraft'
@@ -16,11 +16,11 @@ optdepends=('minecraft: for playing the exported maps')
source=("https://www.worldpainter.net/files/${pkgname}_${pkgver}.tar.gz"
'worldpainter.png'
'worldpainter.desktop'
- 'launch-script')
-sha256sums=('9872d8224bcd27bc1657f47f7911028bada017e0bd7f1154176d65bf71a1b05f'
+ 'launch-script.sh')
+sha256sums=('975dadb205eb91f057ee8b2944c7324250cebba6c2c7b255a0bf83e1b5dfd9bf'
'a93cd4af0e8ef470f48a8dd2773fb9d83a5302f1b9bfba67f43b4ec7500a039e'
'815abfee2eb545a3bac0d2e4e5c0cadc548cc1466c4e0aaf3bfd1f07a15e7741'
- 'fd64d11450f03c8924cbc133a009b3373bc5f80b2589b63391b65db04d82963f')
+ '631cffdb102945a39b28ec33567acd350c3ae5b000face915d24159741942fd0')
package() {
cd "${srcdir}/${pkgname}"
@@ -36,6 +36,6 @@ package() {
find .install4j/user/ -maxdepth 1 -type f -exec install -Dm644 {} "${pkgdir}/opt/${pkgname}/.install4j/user/" \;
install -Dm644 "${srcdir}/worldpainter.png" "${pkgdir}/usr/share/pixmaps/"
- install -Dm755 "${srcdir}/launch-script" "${pkgdir}/usr/bin/worldpainter"
+ install -Dm755 "${srcdir}/launch-script.sh" "${pkgdir}/usr/bin/worldpainter"
install -Dm644 "${srcdir}/worldpainter.desktop" "${pkgdir}/usr/share/applications/worldpainter.desktop"
}
diff --git a/launch-script b/launch-script
deleted file mode 100644
index 40e0e4a755ea..000000000000
--- a/launch-script
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /opt/worldpainter
-./worldpainter -J-Dorg.pepsoft.worldpainter.disableUpdateCheck=true $@
diff --git a/launch-script.sh b/launch-script.sh
new file mode 100644
index 000000000000..7e7768f46210
--- /dev/null
+++ b/launch-script.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -e
+
+cd /opt/worldpainter
+
+exec ./worldpainter -J-Dorg.pepsoft.worldpainter.disableUpdateCheck=true "$@"