Changed names of binaries and SAVEDIR to yiufcrawl per upstream

3 files changed, 21 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 868a45abf324..4897796a0be6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 # Generated by mksrcinfo v8
-# Fri Mar 10 09:13:35 UTC 2017
+# Fri Mar 10 09:39:55 UTC 2017
 pkgbase = stone-soup-yiuf
 	pkgdesc = A fork of Dungeon Crawl Stone Soup roguelike with old races recovered
 	pkgver = 1.4.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/yrmvgh/crawl/
+	install = stone-soup-yiuf.install
 	arch = i686
 	arch = x86_64
 	license = custom
diff --git a/PKGBUILD b/PKGBUILD
index b6fe8213e8d8..3a709a08944a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=stone-soup-yiuf
 pkgver=1.4.3
-pkgrel=1
+pkgrel=2
 pkgdesc='A fork of Dungeon Crawl Stone Soup roguelike with old races recovered'
 arch=('i686' 'x86_64')
 url='https://github.com/yrmvgh/crawl/'
@@ -13,15 +13,16 @@ conflicts=('crawl' 'stone-soup-tile')
 license=('custom')
 source=("https://github.com/yrmvgh/crawl/archive/${pkgver}.tar.gz")
 sha256sums=('b557bb56bdc275d80f327c91a26aab9a15cfcf8b6f683926e7bd2a6d728645d1')
+install=stone-soup-yiuf.install
 
 # used by gendesk to create .desktop file
-_exec=('crawl-yiuf-tiles')
+_exec=('yiufcrawl-tiles')
 _name=('Dungeon Crawl Stone Soup (Yiuf branch)')
 
 package() {
     cd "$srcdir"
     gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
-            --exec 'crawl-yiuf-tiles' --name 'Dungeon Crawl Stone Soup (Yiuf branch)' PKGBUILD
+            --exec 'yiufcrawl-tiles' --name 'Dungeon Crawl Stone Soup (Yiuf branch)' PKGBUILD
 
     cd "crawl-${pkgver}/crawl-ref/source"
 
@@ -40,9 +41,7 @@ package() {
 
     # first build and install tiles version
 
-    make GAME=crawl-yiuf \
-         DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.crawl-yiuf/" \
+    make DESTDIR="${pkgdir}" \
          DATADIR="/usr/share/${pkgname}/data" \
          USE_UNICODE=y \
          TILES=y \
@@ -50,13 +49,11 @@ package() {
 
     # rename tiles executable to avoid clashing with console crawl
 
-    mv "${pkgdir}/usr/bin/crawl-yiuf" "${pkgdir}/usr/bin/crawl-yiuf-tiles"
+    mv "${pkgdir}/usr/bin/yiufcrawl" "${pkgdir}/usr/bin/yiufcrawl-tiles"
 
     # then build and install console version
 
-    make GAME=crawl-yiuf \
-         DESTDIR="${pkgdir}" \
-         SAVEDIR="~/.crawl-yiuf/" \
+    make DESTDIR="${pkgdir}" \
          DATADIR="/usr/share/${pkgname}/data" \
          USE_UNICODE=y \
          install
diff --git a/stone-soup-yiuf.install b/stone-soup-yiuf.install
new file mode 100644
index 000000000000..1d789c3a39cd
--- /dev/null
+++ b/stone-soup-yiuf.install
@@ -0,0 +1,11 @@
+post_upgrade() {
+
+    # return if old pkgver >= 0.9.0-2
+    [[ $(vercmp $2 1.3-1) -le 0 ]] && return
+
+    echo "---------------------------------------------------------------------
+    stone-soup-yiuf saves have moved to ~/.yiufcrawl.
+    If you want to keep your old saves, move ~/.crawl-yiuf to
+    ~/.yiufcrawl.
+---------------------------------------------------------------------"
+}
\ No newline at end of file