Overhaul package

Among other things:

* A newer package is available on GOG. Update the version and related
  logic.
* Make the .desktop file comply with desktop-file-validate's
  suggestions.
* Drop references to firejail. The stuff is nice, but I don't know how
  to maintain it.
* Drop references to lgogdownloader. I've never been able to make it
  work end-to-end.
* Drop PKGEXT override. That's something the user can do on a
  per-package basis if they like, or in their makepkg.conf.

5 files changed, 62 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0ae31ce8f87b..7d3b5c554672 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,21 @@
 pkgbase = gog-bastion
-	pkgdesc = An action role-playing game set in a lush imaginative world (GOG version)
-	pkgver = 2.0.0.1
+	pkgdesc = An action role-playing game set in a lush imaginative world. (GOG version)
+	pkgver = 1.50436.29.08.2018.23317
 	pkgrel = 1
-	url = http://www.supergiantgames.com/games/bastion
+	epoch = 2
+	url = https://www.gog.com/game/bastion
 	arch = i686
 	arch = x86_64
+	groups = games
+	groups = gog
 	license = custom
-	optdepends = firejail: Automatically sandbox this application from your OS
-	source = gog://gog_bastion_2.0.0.1.sh
+	makedepends = unzip
+	source = local://bastion_1_50436_29_08_2018_23317.sh
 	source = gog-bastion.desktop
 	source = gog-bastion
-	sha256sums = 8c5e08d8a22d24b928b06472bb12ac2c039e1dec1931cef89999c305e96478f6
-	sha256sums = fafd66b2441bf8e889ad7331bdc162efb6989b5999bb4235f2ba07fef9f6c718
-	sha256sums = b18220f78b29d6a1f9eb92a9def50021f217784eeaf447b7564b99e11a24ad40
+	sha256sums = e8b35a29dbe0e941232eea3c63ad2ae75f3d605868dfab5acdae85254e73b79a
+	sha256sums = 79c2b1c4e8d00c3b0f9dfc2b700929b6dc85b332047533e418fd0eb5cd41465b
+	sha256sums = 306723d271f33e32d3e057b7b1c69bc0075223364c136898557b24e4ae035a1c
 
 pkgname = gog-bastion
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..29edae448bfd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+# Blacklist:
+*
+
+# Whitelist:
+!.SRCINFO
+!.gitignore
+!PKGBUILD
+!gog-bastion.desktop
+!gog-bastion
diff --git a/PKGBUILD b/PKGBUILD
index 34a08814ee7c..7c4af63b1e60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,49 @@
-# Maintainer: Patrice Peterson <runiq@archlinux.us>
-# Thanks to: Ainola for the base PKGBUILD (gog-undertale)
+# Maintainer: Jeremy Audet <jerebear@protonmail.com>
+# Contributor: Patrice Peterson <runiq@archlinux.us>
+# shellcheck shell=bash
+# shellcheck disable=SC2034,SC2154
 
 pkgname=gog-bastion
-pkgver=2.0.0.1
+# pkgver was once 2.0.0.1
+epoch=2
+pkgver='1.50436.29.08.2018.23317'
 pkgrel=1
-pkgdesc="An action role-playing game set in a lush imaginative world (GOG version)"
-url="http://www.supergiantgames.com/games/bastion"
+pkgdesc='An action role-playing game set in a lush imaginative world. (GOG version)'
+url='https://www.gog.com/game/bastion'
 license=('custom')
+groups=('games' 'gog')
 arch=('i686' 'x86_64')
-# If Firejail is installed, this application will be sandboxed automatically.
-optdepends=('firejail: Automatically sandbox this application from your OS')
-source=(
-    "gog://${pkgname//-/_}_${pkgver}.sh"
-    "${pkgname}.desktop"
-    "$pkgname")
-sha256sums=('8c5e08d8a22d24b928b06472bb12ac2c039e1dec1931cef89999c305e96478f6'
-            'fafd66b2441bf8e889ad7331bdc162efb6989b5999bb4235f2ba07fef9f6c718'
-            'b18220f78b29d6a1f9eb92a9def50021f217784eeaf447b7564b99e11a24ad40')
+source=("local://bastion_${pkgver//./_}.sh"
+        "${pkgname}.desktop"
+        "$pkgname")
+sha256sums=('e8b35a29dbe0e941232eea3c63ad2ae75f3d605868dfab5acdae85254e73b79a'
+            '79c2b1c4e8d00c3b0f9dfc2b700929b6dc85b332047533e418fd0eb5cd41465b'
+            '306723d271f33e32d3e057b7b1c69bc0075223364c136898557b24e4ae035a1c')
 
-# You need to download the gog.com installer file manually or with lgogdownloader.
-DLAGENTS+=("gog::/usr/bin/echo %u Download the GOG file to \"$PWD\" or set up a gog:// DLAGENT.")
-
-# Prevent compressing final package
-PKGEXT=".pkg.tar"
+# ABS automagically figures out how to extract this game file. If said magic
+# starts failing in the future, see prepare() in gog-pyre.
 
 package(){
-    cd "${srcdir}"
+  # game files
+  install -d "${pkgdir}/opt/${pkgname}"
+  cp -rt "${pkgdir}/opt/${pkgname}" "${srcdir}/data/noarch/"*
 
-    # Install game
-    install -d "${pkgdir}/opt/${pkgname}/"
-    install -d "${pkgdir}/opt/${pkgname}/support"
-    install -d "${pkgdir}/usr/bin/"
-    cp -r "data/noarch/game/" "${pkgdir}/opt/${pkgname}/"
-    
+  # launcher
+  chmod 755 "${pkgdir}/opt/${pkgname}/start.sh"
+  install -Dm755 "${srcdir}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
 
-    find "${pkgdir}/opt/${pkgname}" -type d -exec chmod 755 {} \;
-    install -Dm755 "data/noarch/start.sh"               \
-        "${pkgdir}/opt/${pkgname}/"
-    install -Dm755 data/noarch/support/*.{sh,shlib} -t  \
-        "${pkgdir}/opt/${pkgname}/support"
+  # desktop environment integration
+  install -Dm644 \
+    "${srcdir}/data/noarch/support/icon.png" \
+    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm644 \
+    "${srcdir}/${pkgname}.desktop" \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
-    # Desktop integration
-    install -Dm 644 "data/noarch/support/icon.png" \
-        "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-    install -Dm644 "data/noarch/docs/End User License Agreement.txt" \
-        "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-    install -Dm 644 "${srcdir}/${pkgname}.desktop" \
-        "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-    install -Dm755 "$srcdir/$pkgname" "$pkgdir/usr/bin/$pkgname"
+  # license
+  install -Dm644 \
+    "${srcdir}/data/noarch/docs/End User License Agreement.txt" \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
+# vim: ts=2 sw=2 et:
diff --git a/gog-bastion b/gog-bastion
index 328adee58934..0f139dd94a24 100644
--- a/gog-bastion
+++ b/gog-bastion
@@ -1,13 +1,5 @@
-#! /bin/sh
+#!/usr/bin/bash
 
-run="/opt/gog-bastion/start.sh"
-# The launcher fails unless in its dir.
-cd "$(dirname "$run")" || exit 1
-
-if which firejail >/dev/null 2>&1 && [ -z "$FIREJAIL_IGNORE" ]; then
-  echo "Firejail detected. Enforcing a sandbox"
-  echo "To bypass Firejail enforcement, run FIREJAIL_IGNORE=1 $run."
-  firejail --caps.drop=all "$run"
-else
-  "$run"
-fi
+# Setting TERM prevents the application from crashing with "System.Exception:
+# Magic number is wrong: 542." See: https://github.com/mono/mono/issues/11557
+TERM=xterm /opt/gog-bastion/start.sh
diff --git a/gog-bastion.desktop b/gog-bastion.desktop
index 78b229a97e55..485c93339d28 100644
--- a/gog-bastion.desktop
+++ b/gog-bastion.desktop
@@ -6,5 +6,4 @@ Icon=gog-bastion
 Type=Application
 Terminal=false
 StartupNotify=true
-Categories=Game;AudioVideo;
-Encoding=UTF-8
+Categories=Game