added conflict and rebuild PKGBUILD

2 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17f35d7dc777..9468b67672a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dungeonrush-git
 	pkgdesc = A opensource game inspired by Snake with RPG elements, written in pure C with SDL
 	pkgver = r123.2b45a05
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Rapiz1/DungeonRush.git
 	arch = x86_64
 	arch = aarch64
@@ -13,7 +13,8 @@ pkgbase = dungeonrush-git
 	depends = sdl2_ttf
 	depends = sdl2_net
 	depends = sdl2_image
+	conflicts = dungeonrush
 	source = dungeonrush::git+https://github.com/Rapiz1/DungeonRush.git
-	sha1sums = SKIP
+	sha256sums = SKIP
 
 pkgname = dungeonrush-git
diff --git a/PKGBUILD b/PKGBUILD
index 7a74950c18f7..2a951db489d7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,16 @@
 _pkgname=dungeonrush
 pkgname=${_pkgname}-git
 pkgver=r123.2b45a05
-pkgrel=1
+pkgrel=2
 pkgdesc="A opensource game inspired by Snake with RPG elements, written in pure C with SDL"
 arch=('x86_64' 'aarch64')
 url="https://github.com/Rapiz1/DungeonRush.git"
 license=('MIT')
 depends=('sdl2' 'sdl2_mixer' 'sdl2_ttf' 'sdl2_net' 'sdl2_image')
 makedepends=('git' 'cmake')
-source=("${pkgname%-*}::git+https://github.com/Rapiz1/DungeonRush.git")
-sha1sums=('SKIP')
+source=("${_pkgname}::git+${url}")
+sha256sums=('SKIP')
+conflicts=("${_pkgname}")
 
 pkgver() {
 	cd "${_pkgname}"
@@ -20,6 +21,7 @@ pkgver() {
 
 prepare() {
 	sed -i "s#res/#/opt/${_pkgname}/res/#g" "${srcdir}/${_pkgname}/src/res.c"
+  sed -i "s#storage.dat#/opt/${_pkgname}/save/storage.dat#g" "${srcdir}/${_pkgname}/src/storage.h"
 }
 
 build() {
@@ -29,10 +31,10 @@ build() {
 }
 
 package() {
-	install -D -m644 "${srcdir}/${_pkgname}/LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
-  mkdir -p "${pkgdir}/opt/${_pkgname}"
-  mkdir -p "${pkgdir}/usr/bin/"
-	ln -s "/opt/${_pkgname}/dungeon_rush" "${pkgdir}/usr/bin/${_pkgname}"
-	cp -r "${srcdir}/${_pkgname}/bin/res" "${pkgdir}/opt/${_pkgname}/"
-	cp -r "${srcdir}/${_pkgname}/bin/dungeon_rush" "${pkgdir}/opt/${_pkgname}/"
+	cd "${srcdir}/${_pkgname}"
+	install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+  mkdir -p "${pkgdir}/opt/${_pkgname}/save"
+  chmod 777 "${pkgdir}/opt/${_pkgname}/save"
+	cp -r "bin/res" "${pkgdir}/opt/${_pkgname}/"
+  install -Dm755 "bin/dungeon_rush" "${pkgdir}/usr/bin/${_pkgname}"
 }