fixed package

4 files changed, 18 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6565daee6d4d..7a0b9c1cd8d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freerct-git
 	pkgdesc = Open Source RollerCoaster Tycoon 1 and 2 implementation
-	pkgver = r1819.da71e14d
+	pkgver = r2073.4a8090ac
 	pkgrel = 1
 	url = https://github.com/FreeRCT/FreeRCT
 	arch = i686
@@ -16,13 +16,14 @@ pkgbase = freerct-git
 	depends = gnu-free-fonts
 	provides = freerct
 	conflicts = freerct
+	backup = opt/freerct/saves/
 	source = freerct::git+https://github.com/FreeRCT/FreeRCT.git
 	source = freerct.cfg
 	source = freerct.sh
 	source = freerct.desktop
-	md5sums = SKIP
-	md5sums = 18954cf6a20a8d8b21c62e7c9c27a76d
-	md5sums = 1fce36e419ae2d70a28eba03f9cb6fa1
-	md5sums = 9e3aaa8cef3d81b27b868766b61f74a4
+	sha256sums = SKIP
+	sha256sums = 52466c813687b5d3e35e869ed914257c6220c77a7f01e9edd8f830b69624060f
+	sha256sums = e61ab45bce360d4cd064b0f08a95f684b427d0e77e23f9110f4f808e963e5ed8
+	sha256sums = 4f46db97802259b30ba33b69c5bc9433983e0349ce989d6e29dfdd7b8d10b293
 
 pkgname = freerct-git
diff --git a/PKGBUILD b/PKGBUILD
index 1951a8eafce6..dc8c908cd4a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 _pkgname=freerct
 pkgname=${_pkgname}-git
-pkgver=r1819.da71e14d
+pkgver=r2073.4a8090ac
 pkgrel=1
 pkgdesc="Open Source RollerCoaster Tycoon 1 and 2 implementation"
 arch=('i686' 'x86_64' 'aarch64')
@@ -13,33 +13,33 @@ depends=('sdl2' 'sdl2_ttf' 'libzip' 'libpng' 'gnu-free-fonts')
 makedepends=('git' 'cmake')
 conflicts=("${_pkgname}")
 provides=("${_pkgname}")
+backup=('opt/freerct/saves/')
 source=('freerct::git+https://github.com/FreeRCT/FreeRCT.git'
         'freerct.cfg'
         'freerct.sh'
         'freerct.desktop')
-md5sums=('SKIP'
-         '18954cf6a20a8d8b21c62e7c9c27a76d'
-         '1fce36e419ae2d70a28eba03f9cb6fa1'
-         '9e3aaa8cef3d81b27b868766b61f74a4')
+sha256sums=('SKIP'
+         '52466c813687b5d3e35e869ed914257c6220c77a7f01e9edd8f830b69624060f'
+         'e61ab45bce360d4cd064b0f08a95f684b427d0e77e23f9110f4f808e963e5ed8'
+         '4f46db97802259b30ba33b69c5bc9433983e0349ce989d6e29dfdd7b8d10b293')
 
 build() {
   cd "${srcdir}/${_pkgname}"
-  cmake .
+  cmake -DCMAKE_INSTALL_PREFIX='/opt/' .
   make
 }
 
 package() {
   cd "${srcdir}/${_pkgname}"
 
-  mkdir -p "${pkgdir}/opt/freerct/saves/"
+  mkdir -p "${pkgdir}/opt/freerct/"
   mkdir -p "${pkgdir}/usr/bin"
 
   # install all files
   cp -r bin/* "${pkgdir}/opt/freerct/"
 
-  # create savegame outside of installdir
-  chmod 777 "${pkgdir}/opt/freerct/saves/"
-  ln -s "/opt/freerct/saves/saved.fct" "${pkgdir}/opt/freerct/saved.fct"  
+  # install data
+  cp -r data "${pkgdir}/opt/freerct/"
 
   # install executeables
   install -D -m755 "${srcdir}/freerct.sh" "${pkgdir}/usr/bin/freerct"
@@ -51,7 +51,6 @@ package() {
   install -D -m664 LICENSE-gpl-2.0.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 
   install -Dm644 "${srcdir}/${_pkgname}/graphics/sprites/logo/logo.png" ${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${_pkgname}.png
-  #install -Dm644 "${srcdir}/../${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
   install -Dm644 "${startdir}/${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
 }
 
diff --git a/freerct.cfg b/freerct.cfg
index efb3de9808a1..a6cef96289a9 100644
--- a/freerct.cfg
+++ b/freerct.cfg
@@ -1,3 +1,3 @@
 [font]
 medium-size = 12
-medium-path = /usr/share/fonts/gnu-free/FreeSans.otf
+medium-path = /opt/freerct/data/font/Ubuntu-L.ttf
diff --git a/freerct.sh b/freerct.sh
index ca8ed4d574f5..550272508ae9 100755
--- a/freerct.sh
+++ b/freerct.sh
@@ -1,6 +1,4 @@
 #/bin/bash
 
-cwd=$PWD
 cd /opt/freerct
-./freerct
-cd $cwd
+./freerct -i .