[upd] 2.50.1.28→2.50.2.29

4 files changed, 53 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8826d805fc46..7e5333de3045 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zelda-classic
 	pkgdesc = A tribute to Nintendo's The Legend of Zelda (NES)
-	pkgver = 2.50.1.28
+	pkgver = 2.50.2.29
 	pkgrel = 1
 	url = http://zeldaclassic.com
 	install = zelda-classic.install
@@ -12,7 +12,7 @@ pkgbase = zelda-classic
 	depends = lib32-libxcursor
 	depends = lib32-alsa-lib
 	optdepends = lib32-gtk-engine-murrine: needed for the gtk2-launcher
-	source = http://www.shardstorm.com/zcmirror/zc-2-50-1-linux.tar.gz
+	source = https://www.dropbox.com/s/fnipdbanjm8bf2v/zc-2-50-2-linux.tar.gz
 	source = zelda-classic.png
 	source = zelda-classic-zlaunch.png
 	source = zelda-classic-zquest.png
@@ -20,14 +20,14 @@ pkgbase = zelda-classic
 	source = zelda-classic-zlaunch.desktop
 	source = zelda-classic-zquest.desktop
 	source = zelda-classic.sh
-	sha256sums = 1d269e537b83f8b8c40c25ce53b36a57e6243bf0fafd2f5614d0fd1cf9d7a3af
+	sha256sums = 44e105415b1b1d5ca5c625907cf6fc2ce835ddaf9b70a6ace4cd0febe1ae4ed0
 	sha256sums = bb4331ce9940c81edb95d3388f3e3cb459c1559df159d727b0302dd7dbbd82e1
 	sha256sums = bfc007209c30f8b752ad102e2f9e6a4cd4fc447dc306c2712db4f34a8ffb3b7e
 	sha256sums = e436cfa2303703037a800b298ad52f50af8e9e2d3e410e9298a6218761c9d088
 	sha256sums = 23c4158bea70740a3685217dcb0e8cc1225425af437cfccf6d12c83de4743c8c
 	sha256sums = 44e1c4f0a0bed46ce40cb7659863c797b47d1afcef99c86cc329d10898511c2f
 	sha256sums = 72bc054a698e36b9a23e3907ac9112aab78b0424c71ba0c9a657cbe78886572c
-	sha256sums = ee7b5cac453f4d2702cd2e136df85de26cc22ef608329ff55d062760f3f616fb
+	sha256sums = 7188389790cdc030316231103a76b0e692e4a546fed748d86f15f977907be684
 	depends_i686 = libxpm
 	depends_i686 = libxxf86vm
 	depends_i686 = libxcursor
diff --git a/PKGBUILD b/PKGBUILD
index 3fc1df3c1b5d..ef7962ac6e3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=zelda-classic
-pkgver=2.50.1.28
+pkgver=2.50.2.29
 pkgrel=1
 pkgdesc="A tribute to Nintendo's The Legend of Zelda (NES)"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ depends_x86_64=('lib32-libxpm' 'lib32-libxxf86vm' 'lib32-libxcursor' 'lib32-alsa
 optdepends_i686=('gtk-engine-murrine: needed for the gtk2-launcher')
 optdepends_x86_64=('lib32-gtk-engine-murrine: needed for the gtk2-launcher')
 install=$pkgname.install
-source=("http://www.shardstorm.com/zcmirror/zc-2-50-1-linux.tar.gz"
+source=("https://www.dropbox.com/s/fnipdbanjm8bf2v/zc-2-50-2-linux.tar.gz"
         "$pkgname.png"
         "$pkgname-zlaunch.png"
         "$pkgname-zquest.png"
@@ -20,14 +20,14 @@ source=("http://www.shardstorm.com/zcmirror/zc-2-50-1-linux.tar.gz"
         "$pkgname-zlaunch.desktop"
         "$pkgname-zquest.desktop"
         "$pkgname.sh")
-sha256sums=('1d269e537b83f8b8c40c25ce53b36a57e6243bf0fafd2f5614d0fd1cf9d7a3af'
+sha256sums=('44e105415b1b1d5ca5c625907cf6fc2ce835ddaf9b70a6ace4cd0febe1ae4ed0'
             'bb4331ce9940c81edb95d3388f3e3cb459c1559df159d727b0302dd7dbbd82e1'
             'bfc007209c30f8b752ad102e2f9e6a4cd4fc447dc306c2712db4f34a8ffb3b7e'
             'e436cfa2303703037a800b298ad52f50af8e9e2d3e410e9298a6218761c9d088'
             '23c4158bea70740a3685217dcb0e8cc1225425af437cfccf6d12c83de4743c8c'
             '44e1c4f0a0bed46ce40cb7659863c797b47d1afcef99c86cc329d10898511c2f'
             '72bc054a698e36b9a23e3907ac9112aab78b0424c71ba0c9a657cbe78886572c'
-            'ee7b5cac453f4d2702cd2e136df85de26cc22ef608329ff55d062760f3f616fb')
+            '7188389790cdc030316231103a76b0e692e4a546fed748d86f15f977907be684')
 
 package() {
   cd "Zelda Classic"
@@ -35,8 +35,9 @@ package() {
   # create folders
   install -d "$pkgdir"/{opt/$pkgname/samplesoundset,usr/{bin,share/doc/$pkgname}}
 
-  # install binaries
+  # install binaries + libraries
   install -m755 {romview,zelda,zlaunch,zquest}-l "$pkgdir"/opt/$pkgname
+  install -m644 *.so "$pkgdir"/opt/$pkgname
 
   # install data files
   install -m644 samplesoundset/patches.dat "$pkgdir"/opt/$pkgname/samplesoundset
@@ -57,5 +58,5 @@ package() {
   done
 
   # install soundset licence
-  install -Dm644 samplesoundset/COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/soundset
+  install -Dm644 samplesoundset/COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/LICENSE-soundset
 }
diff --git a/zelda-classic.install b/zelda-classic.install
index d344eb520b1c..476b1efe4fec 100644
--- a/zelda-classic.install
+++ b/zelda-classic.install
@@ -1,8 +1,16 @@
 
 post_install() {
-  echo "If you experience Errors, check/delete your ~/.zelda-classic directory."
+  echo " => If you experience problems, check/delete your zelda-classic directory,"
+  echo "    It is located in \$XDG_CONFIG_HOME, default: '~/.config/zelda-classic'."
 }
 
 post_upgrade() {
   post_install
+
+  # the launcher changed in that version
+  if [ $(vercmp $2 2.50.2.29-1) -lt 0 ]; then
+    echo " => This folder was formerly located at '~/.zelda-classic'. The launcher script"
+    echo "    tries to migrate settings and data files to the new location, however custom"
+    echo "    quests are not touched and should be moved manually."
+  fi
 }
diff --git a/zelda-classic.sh b/zelda-classic.sh
index b16e0dd5382b..65e1cf6d1696 100644..100755
--- a/zelda-classic.sh
+++ b/zelda-classic.sh
@@ -1,33 +1,52 @@
-#!/bin/sh
+#!/bin/bash
 #
-# Zelda Classic launcher
+# Zelda Classic launcher - (c) carstene1ns 2013
 #
 # Does some magic juggling with the data files
 
-mkdir -p $HOME/.zelda-classic
+# Changelog:
+#  * 11-2016: Added XDG support
 
-if [ ! -f $HOME/.zelda-classic/1st.qst ]; then
+jail_dir=${XDG_CONFIG_HOME:-$HOME/.config}/zelda-classic
 
-  ln -s /opt/zelda-classic/{*.{qst,dat},zelda.nsf,samplesoundset,{zelda,zlaunch,zquest}-l} $HOME/.zelda-classic/
-  ln -s /usr/share/doc/zelda-classic/zquest.txt $HOME/.zelda-classic/
+# migrate files from old location
+jail_old=$HOME/.zelda-classic
+
+if [ ! -e $jail_dir ]; then
+  mkdir -p $jail_dir
+
+  if [ -e $jail_old ]; then
+    for f in $jail_old/{*.{qst,dat,nsf,txt},samplesoundset,{zelda,zlaunch,zquest}-l}; do
+      [ -L $f ] && rm $f
+    done
+
+    mv $jail_old/{ag.cfg,allegro.log,zc.{icn,lck,sav}} $jail_dir
+  fi
 
 fi
 
-cd $HOME/.zelda-classic
+# symlink files from installation directory
+for f in /opt/zelda-classic/{*.{qst,dat,nsf,so},samplesoundset,z*-l} \
+         /usr/share/doc/zelda-classic/zquest.txt; do
+  [ ! -e $jail_dir/${f##*/} ] && ln -s $f $jail_dir
+done
+
+# change to directory and launch
+cd $jail_dir
 
 case "${0##*/}" in
   zelda-classic)
-    ./zelda-l "$@"
-  ;;
+    exec ./zelda-l "$@"
+    ;;
   zelda-classic-zlaunch)
-    ./zlaunch-l "$@"
-  ;;
+    exec ./zlaunch-l "$@"
+    ;;
   zelda-classic-zquest)
-    ./zquest-l "$@"
-  ;;
+    exec ./zquest-l "$@"
+    ;;
   *)
     echo "Something is wrong with your Zelda Classic installation."
-  ;;
+    ;;
 esac
 
 cd - &>/dev/null