add TWBT

4 files changed, 51 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49327fb1c6a7..37713899d0de 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,9 @@
-# Generated by mksrcinfo v8
-# Sun May 14 21:20:38 UTC 2017
-pkgbase = dfhack-bin
-	pkgdesc = memory hacking library for Dwarf Fortress and a set of tools that use it
+pkgbase = dfhack-twbt-bin
+	pkgdesc = memory hacking library for Dwarf Fortress and a set of tools that use it including Text Will Be Text plugin
 	pkgver = 0.43.05
 	pkgrel = 5
-	url = http://dfhack.readthedocs.io/en/v0.43.05/
+	url = https://dfhack.readthedocs.org/
 	arch = x86_64
-	arch = i686
 	license = custom
 	depends = dwarffortress=0.43.05
 	depends = lua
@@ -23,12 +20,12 @@ pkgbase = dfhack-bin
 	conflicts = dfhack-git
 	source = dfhack.sh
 	source = dfhack-run.sh
-	md5sums = 81f5909c1a32391679f968e40f24d5ca
+	source = https://github.com/DFHack/dfhack/releases/download/0.43.05-r1/dfhack-0.43.05-r1-Linux-64-gcc-4.8.1.tar.bz2
+	source = https://github.com/mifki/df-twbt/releases/download/v5.84/twbt-5.84-linux.zip
+	md5sums = af6d938767d1f09608df67dc4c0fd1a1
 	md5sums = 3853c6f890d3541f710f2c4833a9e696
-	source_x86_64 = https://github.com/DFHack/dfhack/releases/download/0.43.05-r1/dfhack-0.43.05-r1-Linux-64-gcc-4.8.1.tar.bz2
-	md5sums_x86_64 = 7b5783f6f8a0bf34282d7d0b53d65b6e
-	source_i686 = https://github.com/DFHack/dfhack/releases/download/0.43.05-r1/dfhack-0.43.05-r1-Linux-32-gcc-4.8.1.tar.bz2
-	md5sums_i686 = 4c75daf270e8b7880333468ecd24c15b
+	md5sums = 7b5783f6f8a0bf34282d7d0b53d65b6e
+	md5sums = fd8a0e88f9acd3ee6094756e7b44f82e
 
-pkgname = dfhack-bin
+pkgname = dfhack-twbt-bin
 
diff --git a/.gitignore b/.gitignore
index 42ab3cf03f2d..bb5e23f1b778 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 *.pkg.tar*
+/*.bz2
+/pkg
+/src
+/*.zip
diff --git a/PKGBUILD b/PKGBUILD
index 815ca5fd3c97..fdb88c2e3217 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,53 @@
-# Maintainer: Christian Krause ("wookietreiber") <christian.krause@mailbox.org>
+# Maintainer: Paul Davis ("dangersalad") <paul@dangersalad.com>
+# Original Maintainer: Christian Krause ("wookietreiber") <christian.krause@mailbox.org>
 
-pkgname=dfhack-bin
+pkgname=dfhack-twbt-bin
 _pkgname=dfhack
 pkgver=0.43.05
 _pkgver=$pkgver-r1
 pkgrel=5
-pkgdesc="memory hacking library for Dwarf Fortress and a set of tools that use it"
-arch=('x86_64' 'i686')
-url="http://dfhack.readthedocs.io/en/v$pkgver/"
+pkgdesc="memory hacking library for Dwarf Fortress and a set of tools that use it including Text Will Be Text plugin"
+arch=('x86_64')
+url="https://dfhack.readthedocs.org/"
 license=('custom')
 depends=(dwarffortress=$pkgver lua protobuf libpng12 libxrandr libjpeg6 freetype2 libglvnd libxcursor libxinerama)
 
 conflicts=(dfhack dfhack-git)
 provides=(dfhack)
 
-source_i686=(https://github.com/DFHack/dfhack/releases/download/$_pkgver/dfhack-$_pkgver-Linux-32-gcc-4.8.1.tar.bz2)
-source_x86_64=(https://github.com/DFHack/dfhack/releases/download/$_pkgver/dfhack-$_pkgver-Linux-64-gcc-4.8.1.tar.bz2)
+source=(
+    dfhack.sh
+    dfhack-run.sh
+    https://github.com/DFHack/dfhack/releases/download/$_pkgver/dfhack-$_pkgver-Linux-64-gcc-4.8.1.tar.bz2
+    https://github.com/mifki/df-twbt/releases/download/v5.84/twbt-5.84-linux.zip
+)
 
-source=(dfhack.sh
-        dfhack-run.sh)
+md5sums=('af6d938767d1f09608df67dc4c0fd1a1'
+         '3853c6f890d3541f710f2c4833a9e696'
+         '7b5783f6f8a0bf34282d7d0b53d65b6e'
+         'fd8a0e88f9acd3ee6094756e7b44f82e')
 
 prepare() {
-  sed -e 's|setarch i386 -R ||' \
-      -i $srcdir/dfhack
+    sed -e 's|setarch i386 -R ||' \
+        -i $srcdir/dfhack
 }
 
 package() {
-  install -d $pkgdir/opt/dwarffortress
-
-  cp -r $srcdir/{hack,dfhack,dfhack-run,dfhack-config,dfhack.init-example,stonesense} $pkgdir/opt/dwarffortress
-
-  install -Dm755 $srcdir/dfhack.sh     $pkgdir/usr/bin/dfhack
-  install -Dm755 $srcdir/dfhack-run.sh $pkgdir/usr/bin/dfhack-run
-
-  install -Dm644 $srcdir/hack/LICENSE.rst $pkgdir/usr/share/licenses/$pkgname/LICENSE
+    install -d $pkgdir/opt/dwarffortress
+
+    cp -r $srcdir/{hack,dfhack,dfhack-run,dfhack-config,dfhack.init-example,stonesense} $pkgdir/opt/dwarffortress
+
+    install -Dm755 $srcdir/dfhack.sh     $pkgdir/usr/bin/dfhack
+    install -Dm755 $srcdir/dfhack-run.sh $pkgdir/usr/bin/dfhack-run
+    
+    install -Dm755 $srcdir/$_pkgver/automaterial.plug.so $pkgdir/opt/dwarffortress/hack/plugins
+    install -Dm755 $srcdir/$_pkgver/mousequery.plug.so $pkgdir/opt/dwarffortress/hack/plugins
+    install -Dm755 $srcdir/$_pkgver/resume.plug.so $pkgdir/opt/dwarffortress/hack/plugins
+    install -Dm755 $srcdir/$_pkgver/twbt.plug.so $pkgdir/opt/dwarffortress/hack/plugins
+    
+    install -Dm755 $srcdir/shadows.png $pkgdir/opt/dwarffortress/data/art/shadows.png
+    install -Dm755 $srcdir/overrides.txt $pkgdir/opt/dwarffortress/data/init/overrides.txt
+
+    install -Dm644 $srcdir/hack/LICENSE.rst $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
 
-md5sums=('81f5909c1a32391679f968e40f24d5ca'
-         '3853c6f890d3541f710f2c4833a9e696')
-md5sums_x86_64=('7b5783f6f8a0bf34282d7d0b53d65b6e')
-md5sums_i686=('4c75daf270e8b7880333468ecd24c15b')
diff --git a/dfhack.sh b/dfhack.sh
index 0acc659db555..9b8f1f768c9c 100644
--- a/dfhack.sh
+++ b/dfhack.sh
@@ -22,7 +22,11 @@ if [[ ! -d ~/.dwarffortress/hack ]] ; then
   ln -s /opt/dwarffortress/dfhack.init-example ~/.dwarffortress/dfhack.init-example
   cp -r /opt/dwarffortress/dfhack-config       ~/.dwarffortress/dfhack-config
 
+  cp /opt/dwarffortress/data/art/shadows.png    ~/.dwarffortress/data/art
+  cp /opt/dwarffortress/data/init/overrides.txt ~/.dwarffortress/data/init
+
   cp ~/.dwarffortress/dfhack.init{-example,}
+  
 fi
 
 # workaround for bug in Debian/Ubuntu SDL patch