Added support for the required 'mods' and 'maps' folders

3 files changed, 43 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 611cdc98e47a..8f3cb8b71fdd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = augustus-game
 	pkgdesc = An enhanced re-implementation of Caesar III (Original copy required)
 	pkgver = 2.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/Keriew/augustus
 	install = augustus-game.install
 	arch = i686
@@ -10,11 +10,12 @@ pkgbase = augustus-game
 	makedepends = cmake
 	depends = sdl2
 	depends = sdl2_mixer
+	depends = libpng
 	source = augustus-game.desktop
 	source = augustus-game.install
 	source = https://github.com/Keriew/augustus/archive/v2.0.1.tar.gz
 	sha256sums = 52fd21bbd8a32cee21399c598283dfea11fa507e01e92c8344fb6e021fae0928
-	sha256sums = a13556dff5011df049ec64964db94f6cfcdc0e5fb18801e190af0a95b840af75
+	sha256sums = 95793de9019c9343e39add889f3efab5833702f068d39b4c727b2f8ae92e093c
 	sha256sums = 9210b6123989554a22f39b4b53bb25d2f75407355cfc2a8b28a788df967a03ea
 
 pkgname = augustus-game
diff --git a/PKGBUILD b/PKGBUILD
index b2e880089993..ffaa69ec1f9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,17 +4,17 @@
 _pkgname=augustus
 pkgname=$_pkgname-game
 pkgver=2.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="An enhanced re-implementation of Caesar III (Original copy required)"
 arch=('i686' 'x86_64')
 url="https://github.com/Keriew/augustus"
 license=('AGPL')
 makedepends=('cmake')
-depends=('sdl2' 'sdl2_mixer')
-install="$pkgname.install"
-source=($pkgname.desktop $pkgname.install $url/archive/v$pkgver.tar.gz)
+depends=('sdl2' 'sdl2_mixer' 'libpng')
+install="${pkgname}.install"
+source=(${pkgname}.desktop ${pkgname}.install $url/archive/v$pkgver.tar.gz)
 sha256sums=('52fd21bbd8a32cee21399c598283dfea11fa507e01e92c8344fb6e021fae0928'
-            'a13556dff5011df049ec64964db94f6cfcdc0e5fb18801e190af0a95b840af75'
+            '03467d55f4314a46ad3c8e6b16e689f36772969c42869823c175b01e6f6392c7'
             '9210b6123989554a22f39b4b53bb25d2f75407355cfc2a8b28a788df967a03ea')
 
 build() {
@@ -24,10 +24,17 @@ build() {
 }
 
 package() {
-    install -Dm755 "$srcdir/$_pkgname-$pkgver/$_pkgname" "$pkgdir/usr/bin/$pkgname"
-    install -Dm644 "$srcdir/$_pkgname-$pkgver/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-    install -Dm664 "$srcdir/$_pkgname-$pkgver/res/${_pkgname}_48.png" "$pkgdir/usr/share/pixmaps/${pkgname}48.png"
-    install -Dm664 "$srcdir/$_pkgname-$pkgver/res/${_pkgname}_256.png" "$pkgdir/usr/share/pixmaps/${pkgname}256.png"
-    install -Dm664 "$srcdir/$_pkgname-$pkgver/res/${_pkgname}_512.png" "$pkgdir/usr/share/pixmaps/${pkgname}.png"
-    install -Dm664 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+    install -Dm755 "$srcdir/${_pkgname}-${pkgver}/${_pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "$srcdir/${_pkgname}-${pkgver}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+    install -Dm664 "$srcdir/${_pkgname}-${pkgver}/res/${_pkgname}_48.png" "${pkgdir}/usr/share/pixmaps/${pkgname}48.png"
+    install -Dm664 "$srcdir/${_pkgname}-${pkgver}/res/${_pkgname}_256.png" "${pkgdir}/usr/share/pixmaps/${pkgname}256.png"
+    install -Dm664 "$srcdir/${_pkgname}-${pkgver}/res/${_pkgname}_512.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm664 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+
+    # Install additional folders to /opt
+    install -m 775 -d "${pkgdir}/opt/${pkgname}"
+    install -m 775 -d "${pkgdir}/opt/${pkgname}/mods"
+    install -m 775 -d "${pkgdir}/opt/${pkgname}/res/maps"
+    cp -r "$srcdir/$_pkgname-$pkgver/mods"  "${pkgdir}/opt/${pkgname}/"
+    cp -r "$srcdir/$_pkgname-$pkgver/res/maps" "${pkgdir}/opt/${pkgname}/res/"
 }
diff --git a/augustus-game.install b/augustus-game.install
index 99271fff96de..685a0cf01032 100644
--- a/augustus-game.install
+++ b/augustus-game.install
@@ -1,3 +1,25 @@
 post_install() {
     echo ">> augustus requires a copy of the original Caesar III. The binary will ask for game directory on first start."
+
+    echo "
+augustus also requires additional folders/files to be installed to your Caesar III installation.
+The easiest way is to symlink the 'maps' and 'mods' folder from '/opt/augustus-game'
+into the root of your Caesar III installation.
+
+If you are in your Caesar III installation folder
+you can copy & paste the following lines to symlink them (depending on your shell):
+
+  ln -s /opt/augustus-game/res/maps .
+  ln -s /opt/augustus-game/mods .
+
+
+For further information and how to add high-quality MP3 music/sounds to your installation see:
+  https://github.com/Keriew/augustus/blob/master/doc/RUNNING.md
+"
+}
+
+post_remove() {
+    echo "
+Don't forget to remove/unlink the 'maps' and 'mods' folder from your Caesar III installation.
+"
 }