upgpkg: gog-terraria 1.4.4.9.v4.60321-1

upstream release

3 files changed, 21 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 888aceb14530..498bd5e29ad9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = gog-terraria
 	pkgdesc = The very world is at your fingertips as you fight for survival, fortune, and glory.
-	pkgver = 1.4.3.2.51716
+	pkgver = 1.4.4.9.v4.60321
 	pkgrel = 1
-	epoch = 1
 	url = http://terraria.org/
 	arch = x86_64
 	license = custom
 	makedepends = libarchive
 	depends = sdl2
 	optdepends = firejail: Automatically sandbox this application from your OS
-	noextract = setup_terraria_1.4.3.2.51716.sh
-	source = setup_terraria_1.4.3.2.51716.sh::gogdownloader://terraria/en3installer0
+	noextract = terraria_v1_4_4_9_v4_60321.sh
+	options = !strip
+	source = file://terraria_v1_4_4_9_v4_60321.sh
 	source = gog-terraria.desktop
 	source = gog-terraria
 	source = gog-terraria.profile
-	sha256sums = fbd615630785e191e90b9d72f439960850c5c1fcc32d052bc757af196f80fea0
+	sha256sums = 9ef66aa58acbdce161221539d91845b68a11bcd75560a019dc09206918aae876
 	sha256sums = 815bf359c2828cdefee1e33a978a84a2ebb538450197a5792b62e382ae3e3093
 	sha256sums = ce9c75ce912e6c1c081e7fb9f0a4b49c8cf2274e82da4ead1cab6ab9c527cd79
 	sha256sums = 9ec20a7515dd54a518da4fab006e0b2313deff1c341a3bd163f0e1305b6be5b6
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..e405232bc132
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+pkg/
+src/
+*terraria*
diff --git a/PKGBUILD b/PKGBUILD
index ea248c4dcba3..e030f8acc5b8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,11 @@
-# Maintainer: Swix
+# shellcheck disable=SC2034,SC2154,SC2164
+# Maintainer: JustKidding <jk@vin.ovh>
 
 pkgname=gog-terraria
-pkgver=1.4.3.2.51716
+pkgver=1.4.4.9.v4.60321
 pkgrel=1
-epoch=1
 
-_gamename=${pkgname#gog-}
-_gamename=${_gamename//-/_}
-_setupname="setup_${_gamename}_${pkgver}.sh"
+_setupname="terraria_v${pkgver//\./_}.sh"
 
 pkgdesc="The very world is at your fingertips as you fight for survival, fortune, and glory."
 url="http://terraria.org/"
@@ -16,21 +14,21 @@ arch=('x86_64')
 depends=('sdl2')
 makedepends=('libarchive')
 optdepends=('firejail: Automatically sandbox this application from your OS')
-source=("${_setupname}::gogdownloader://${_gamename}/en3installer0"
+source=("file://${_setupname}"
         "${pkgname}.desktop"
         "$pkgname"
         "$pkgname.profile")
 
 # bsdtar is really cool but I want to control what I'm extracting
 noextract=("${_setupname}")
-sha256sums=('fbd615630785e191e90b9d72f439960850c5c1fcc32d052bc757af196f80fea0'
+sha256sums=('9ef66aa58acbdce161221539d91845b68a11bcd75560a019dc09206918aae876'
             '815bf359c2828cdefee1e33a978a84a2ebb538450197a5792b62e382ae3e3093'
             'ce9c75ce912e6c1c081e7fb9f0a4b49c8cf2274e82da4ead1cab6ab9c527cd79'
             '9ec20a7515dd54a518da4fab006e0b2313deff1c341a3bd163f0e1305b6be5b6')
-
+options=(!strip)
 
 # You need to download the gog.com installer file manually or with lgogdownloader.
-DLAGENTS+=("gogdownloader::/usr/bin/echo %u - This is is not a real URL, you need to download the GOG file manually to \"$PWD/${_setupname}\" or setup a gogdownloader:// DLAGENT. Read this PKGBUILD for more information.")
+#DLAGENTS+=("gogdownloader::/usr/bin/echo %u - This is is not a real URL, you need to download the GOG file manually to \"$PWD/${_setupname}\" or setup a gogdownloader:// DLAGENT. Read this PKGBUILD for more information.")
 #DLAGENTS+=("gogdownloader::/usr/bin/lgogdownloader --download-file=%u -o %o")
 
 # Prevent compressing final package
@@ -39,15 +37,15 @@ PKGEXT='.pkg.tar'
 prepare(){
     datasource="${_setupname}"
 
-    offset=`sed -n '/.*offset=.*head/{s/.*head -n \([0-9]*\).*/\1/p;q}' "$datasource"`
-    toskip=`sed -n '/filesizes=/{s/.*="\([0-9]*\)"/\1/p;q}' "$datasource"`
+    offset=$(sed -n '/.*offset=.*head/{s/.*head -n \([0-9]*\).*/\1/p;q}' "$datasource")
+    toskip=$(sed -n '/filesizes=/{s/.*="\([0-9]*\)"/\1/p;q}' "$datasource")
 
-    mkdir "${srcdir}/terraria"
-    tail -n+$(($offset+1)) "$datasource" | tail -c+$(($toskip+1)) | bsdtar -C "${srcdir}/terraria" -xvf- 2> /dev/null
+    mkdir terraria
+    tail -n+$((offset+1)) "$datasource" | tail -c+$((toskip+1)) | bsdtar -C terraria -xvf- 2> /dev/null
 }
 
 package(){
-    pushd "${srcdir}/terraria/data/noarch"
+    cd terraria/data/noarch
 
     # Install game
     install -d "${pkgdir}/opt/${pkgname}/"
@@ -77,6 +75,4 @@ package(){
 
     # Fix permissions
     chmod +x "${pkgdir}/opt/${pkgname}/game/Terraria"{,Server}{,.bin.x86_64}
-
-    popd
 }