Fixes/structure changes.

4 files changed, 32 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c9861f8241cf..454ad7dbc3d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = broforce-gog
-	pkgdesc = GOG version of Broforce
+	pkgdesc = Broforce Linux-native with data via GOG
 	pkgver = 1130_20201008
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.gog.com/game/broforce
 	arch = i686
 	arch = x86_64
@@ -11,11 +11,13 @@ pkgbase = broforce-gog
 	depends = libx11
 	depends = libxext
 	depends = desktop-file-utils
+	provides = broforce
+	conflicts = broforce-steam
 	source = broforce_1130_20201008_41824.sh::gogdownloader://broforce/en3installer0
-	source = broforce-gog
-	source = broforce-gog.desktop
+	source = broforce.sh
+	source = broforce.desktop
 	sha256sums = 405793776eda4d2fb54dcf20652021bc994070be60db2964395b79b61fbdae7f
-	sha256sums = e3f5fd7d180e2db767d288befbb0c1b23e724d5b7fced1b0c98680277ea21219
-	sha256sums = d0a43b39be7b3160f3e199554a7f97d0dbe75666d55a8c479128dce935f5d3e4
+	sha256sums = cae03d845e18a3879864bbdd039c30ffdf3e5aa50f79ffae81d5663f23117cc7
+	sha256sums = f4d0ab0b9014724ded958a7cf4a6c62e6bcc056c1ffc27ea21a11d506f22bebf
 
 pkgname = broforce-gog
diff --git a/PKGBUILD b/PKGBUILD
index f246edd915a4..75b8ec56c105 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,21 @@
 # Maintainer: John-Michael Mulesa <jmulesa at gmail dot com>
 
 pkgname=broforce-gog
+_pkgname=broforce
 pkgver=1130_20201008
-pkgrel=2
-pkgdesc="GOG version of Broforce"
+pkgrel=3
+pkgdesc="Broforce Linux-native with data via GOG"
 arch=("i686" "x86_64")
 url="http://www.gog.com/game/broforce"
 license=("custom")
 groups=("games")
-source=("broforce_${pkgver}_41824.sh::gogdownloader://broforce/en3installer0" "broforce-gog" "broforce-gog.desktop")
-sha256sums=('405793776eda4d2fb54dcf20652021bc994070be60db2964395b79b61fbdae7f'
-            'e3f5fd7d180e2db767d288befbb0c1b23e724d5b7fced1b0c98680277ea21219'
-            'd0a43b39be7b3160f3e199554a7f97d0dbe75666d55a8c479128dce935f5d3e4')
+provides=('broforce')
+conflicts=('broforce-steam')
+source=("broforce_${pkgver}_41824.sh::gogdownloader://broforce/en3installer0" "${_pkgname}.sh" "${_pkgname}.desktop")
 depends=(libgl libx11 libxext desktop-file-utils)
+sha256sums=('405793776eda4d2fb54dcf20652021bc994070be60db2964395b79b61fbdae7f'
+            'cae03d845e18a3879864bbdd039c30ffdf3e5aa50f79ffae81d5663f23117cc7'
+            'f4d0ab0b9014724ded958a7cf4a6c62e6bcc056c1ffc27ea21a11d506f22bebf')
 
 # If you want to use lgogdownloader add the following to /etc/makepkg.conf
 # DLAGENTS+=('gogdownloader::/usr/bin/lgogdownloader --download-file=%u -o %o')
@@ -20,27 +23,27 @@ DLAGENTS+=("gogdownloader::/usr/bin/echo Could not find gog installer file (%u).
 
 package() {
   # game files
-  mkdir -p "${pkgdir}/opt/${pkgname}"
-  cp -r "${srcdir}/data/noarch/"* "${pkgdir}/opt/${pkgname}/"
+  mkdir -p "${pkgdir}/opt/${_pkgname}"
+  cp -r "${srcdir}/data/noarch/"* "${pkgdir}/opt/${_pkgname}/"
 
   # launcher and permissions
   # Note: Saves and Levels data may be permissions restricted to one user by default.
-  chmod 755 "${pkgdir}/opt/${pkgname}/start.sh"
-  chmod 755 "${pkgdir}/opt/${pkgname}/game/Broforce.x86_64"
-  chmod 755 "${pkgdir}/opt/${pkgname}/game/Broforce.x86"
-  chmod 777 "${pkgdir}/opt/${pkgname}/game"
-  install -Dm755 "${srcdir}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  chmod 755 "${pkgdir}/opt/${_pkgname}/start.sh"
+  chmod 755 "${pkgdir}/opt/${_pkgname}/game/Broforce.x86_64"
+  chmod 755 "${pkgdir}/opt/${_pkgname}/game/Broforce.x86"
+  chmod 777 "${pkgdir}/opt/${_pkgname}/game"
+  install -Dm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
 
   # desktop environment integration
   install -Dm644 \
     "${srcdir}/data/noarch/support/icon.png" \
-    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
   install -Dm644 \
-    "${srcdir}/${pkgname}.desktop" \
-    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+    "${srcdir}/${_pkgname}.desktop" \
+    "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
 
   # license
   install -Dm644 \
     "${srcdir}/data/noarch/docs/End User License Agreement.txt" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
diff --git a/broforce-gog.desktop b/broforce.desktop
index 60f6f33c537a..37def6f34079 100644
--- a/broforce-gog.desktop
+++ b/broforce.desktop
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Name=Broforce
-Comment=GOG version of Broforce
-Exec=/usr/bin/broforce-gog
-Icon=broforce-gog
+Comment=Broforce Linux-native
+Exec=/usr/bin/broforce
+Icon=broforce
 Terminal=false
 Type=Application
 Categories=Game;
diff --git a/broforce-gog b/broforce.sh
index feeec66cd0aa..42d18ffe0984 100644
--- a/broforce-gog
+++ b/broforce.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
-cd /opt/broforce-gog
+cd /opt/broforce
 ./start.sh