Click here to go back to the commit logs for zelda-classic-bin.

Commit:

---

Hash: e0dbc9657fdbaaf5b032e946edea727f28f7c188

Message: Cleanup Add all-in-one launcher.

Diff

---

diff --git a/.SRCINFO b/.SRCINFO
index 8f77b22..69518b9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = zelda-classic
 	pkgdesc = A tribute to Nintendo's The Legend of Zelda (NES)
 	pkgver = 2.5.0.24
-	pkgrel = 1
+	pkgrel = 2
 	url = http://zeldaclassic.com
 	install = zelda-classic.install
 	arch = i686
@@ -13,32 +13,18 @@ pkgbase = zelda-classic
 	source = zelda-classic.png
 	source = zelda-classic-zlaunch.png
 	source = zelda-classic-zquest.png
-	source = zelda-classic.sh
-	source = zelda-classic-zlaunch.sh
-	source = zelda-classic-zquest.sh
 	source = zelda-classic.desktop
 	source = zelda-classic-zlaunch.desktop
 	source = zelda-classic-zquest.desktop
-	md5sums = 13fc7a5550d69cce15aaa5afa87a917d
-	md5sums = 13b15546648bd9ac31e1a9a921078360
-	md5sums = 64691761318b1087a55329f5a6997255
-	md5sums = 7523e9eccb419ed73ce9389bb5efe962
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
+	source = zelda-classic.sh
 	sha256sums = 6fbd660403cc7f3292b3892ab08620ed02f3276e82274b35b210b09479783aa9
 	sha256sums = bb4331ce9940c81edb95d3388f3e3cb459c1559df159d727b0302dd7dbbd82e1
 	sha256sums = bfc007209c30f8b752ad102e2f9e6a4cd4fc447dc306c2712db4f34a8ffb3b7e
 	sha256sums = e436cfa2303703037a800b298ad52f50af8e9e2d3e410e9298a6218761c9d088
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = SKIP
+	sha256sums = 23c4158bea70740a3685217dcb0e8cc1225425af437cfccf6d12c83de4743c8c
+	sha256sums = 44e1c4f0a0bed46ce40cb7659863c797b47d1afcef99c86cc329d10898511c2f
+	sha256sums = 72bc054a698e36b9a23e3907ac9112aab78b0424c71ba0c9a657cbe78886572c
+	sha256sums = ee7b5cac453f4d2702cd2e136df85de26cc22ef608329ff55d062760f3f616fb
 
 pkgname = zelda-classic
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f2215d..feeab7c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,65 +1,63 @@
-# Maintainer: carstene1ns <arch carsten-teibes de>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
 
 pkgname=zelda-classic
 pkgver=2.5.0.24
-pkgrel=1
+pkgrel=2
 pkgdesc="A tribute to Nintendo's The Legend of Zelda (NES)"
 arch=('i686' 'x86_64')
 url="http://zeldaclassic.com"
 license=('custom: Freeware')
 depends=('allegro4')
-[ "$CARCH" = "x86_64" ] && depends=('lib32-allegro4')
 optdepends=('gtk-engine-murrine: needed for the gtk2-launcher')
-[ "$CARCH" = "x86_64" ] && optdepends=('lib32-gtk-engine-murrine: needed for the gtk2-launcher')
+if [ "$CARCH" == "x86_64" ]; then
+  depends=('lib32-allegro4')
+  optdepends=('lib32-gtk-engine-murrine: needed for the gtk2-launcher')
+fi
 install=$pkgname.install
 source=("http://www.shardstorm.com/zcmirror/zc-250-linux.tar.gz"
         "$pkgname.png"
         "$pkgname-zlaunch.png"
         "$pkgname-zquest.png"
-        "$pkgname.sh"
-        "$pkgname-zlaunch.sh"
-        "$pkgname-zquest.sh"
         "$pkgname.desktop"
         "$pkgname-zlaunch.desktop"
-        "$pkgname-zquest.desktop")
-md5sums=('13fc7a5550d69cce15aaa5afa87a917d'
-         '13b15546648bd9ac31e1a9a921078360'
-         '64691761318b1087a55329f5a6997255'
-         '7523e9eccb419ed73ce9389bb5efe962'
-         'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+        "$pkgname-zquest.desktop"
+        "$pkgname.sh")
 sha256sums=('6fbd660403cc7f3292b3892ab08620ed02f3276e82274b35b210b09479783aa9'
             'bb4331ce9940c81edb95d3388f3e3cb459c1559df159d727b0302dd7dbbd82e1'
             'bfc007209c30f8b752ad102e2f9e6a4cd4fc447dc306c2712db4f34a8ffb3b7e'
             'e436cfa2303703037a800b298ad52f50af8e9e2d3e410e9298a6218761c9d088'
-            'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+            '23c4158bea70740a3685217dcb0e8cc1225425af437cfccf6d12c83de4743c8c'
+            '44e1c4f0a0bed46ce40cb7659863c797b47d1afcef99c86cc329d10898511c2f'
+            '72bc054a698e36b9a23e3907ac9112aab78b0424c71ba0c9a657cbe78886572c'
+            'ee7b5cac453f4d2702cd2e136df85de26cc22ef608329ff55d062760f3f616fb')
 
 package() {
   cd "Zelda Classic"
 
   # create folders
-  install -d $pkgdir/{opt/$pkgname/samplesoundset,usr/{bin,share/doc/$pkgname}}
+  install -d "$pkgdir"/{opt/$pkgname/samplesoundset,usr/{bin,share/doc/$pkgname}}
 
   # install binaries
-  install -m755 {romview,zelda,zlaunch,zquest}-l $pkgdir/opt/$pkgname
+  install -m755 {romview,zelda,zlaunch,zquest}-l "$pkgdir"/opt/$pkgname
 
   # install data files
-  install -m644 samplesoundset/patches.dat $pkgdir/opt/$pkgname/samplesoundset
-  install -m644 *.{qst,dat,nsf} $pkgdir/opt/$pkgname
+  install -m644 samplesoundset/patches.dat "$pkgdir"/opt/$pkgname/samplesoundset
+  install -m644 *.{qst,dat,nsf} "$pkgdir"/opt/$pkgname
 
   # install doc files
-  install -m644 *.{txt,zh} $pkgdir/usr/share/doc/$pkgname
+  install -m644 *.{txt,zh} "$pkgdir"/usr/share/doc/$pkgname
 
   # install launchers
-  install -m755 ../$pkgname.sh $pkgdir/usr/bin/$pkgname
-  install -m755 ../$pkgname-zlaunch.sh $pkgdir/usr/bin/$pkgname-zlaunch
-  install -m755 ../$pkgname-zquest.sh $pkgdir/usr/bin/$pkgname-zquest
+  install -m755 ../$pkgname.sh "$pkgdir"/usr/bin/$pkgname
+  ln -s $pkgname "$pkgdir"/usr/bin/$pkgname-zlaunch
+  ln -s $pkgname "$pkgdir"/usr/bin/$pkgname-zquest
 
   # install icon and desktop files
   for i in zelda-classic{,-zlaunch,-zquest}; do
-    install -Dm644 ../$i.png $pkgdir/usr/share/pixmaps/$i.png
-    install -Dm644 ../$i.desktop $pkgdir/usr/share/applications/$i.desktop
+    install -Dm644 ../$i.png "$pkgdir"/usr/share/pixmaps/$i.png
+    install -Dm644 ../$i.desktop "$pkgdir"/usr/share/applications/$i.desktop
   done
 
   # install soundset licence
-  install -Dm644 samplesoundset/COPYRIGHT $pkgdir/usr/share/licenses/zelda-classic/soundset
+  install -Dm644 samplesoundset/COPYRIGHT "$pkgdir"/usr/share/licenses/$pkgname/soundset
 }
diff --git a/zelda-classic-zlaunch.sh b/zelda-classic-zlaunch.sh
deleted file mode 100644
index 833e9e5..0000000
--- a/zelda-classic-zlaunch.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# Zelda Classic launcher
-#
-# Does some magic juggling with the data files
-
-mkdir -p $HOME/.zelda-classic
-
-if [ ! -f $HOME/.zelda-classic/1st.qst ]; then
-
-  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/
-
-fi
-
-cd $HOME/.zelda-classic
-./zlaunch-l "$@"
-cd - &>/dev/null
diff --git a/zelda-classic-zquest.sh b/zelda-classic-zquest.sh
deleted file mode 100644
index 54007c1..0000000
--- a/zelda-classic-zquest.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# Zelda Classic launcher
-#
-# Does some magic juggling with the data files
-
-mkdir -p $HOME/.zelda-classic
-
-if [ ! -f $HOME/.zelda-classic/1st.qst ]; then
-
-  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/
-
-fi
-
-cd $HOME/.zelda-classic
-./zquest-l "$@"
-cd - &>/dev/null
diff --git a/zelda-classic.sh b/zelda-classic.sh
index 3af10c4..b16e0dd 100644
--- a/zelda-classic.sh
+++ b/zelda-classic.sh
@@ -14,5 +14,20 @@ if [ ! -f $HOME/.zelda-classic/1st.qst ]; then
 fi
 
 cd $HOME/.zelda-classic
-./zelda-l "$@"
+
+case "${0##*/}" in
+  zelda-classic)
+    ./zelda-l "$@"
+  ;;
+  zelda-classic-zlaunch)
+    ./zlaunch-l "$@"
+  ;;
+  zelda-classic-zquest)
+    ./zquest-l "$@"
+  ;;
+  *)
+    echo "Something is wrong with your Zelda Classic installation."
+  ;;
+esac
+
 cd - &>/dev/null