Upgrade to v3.3.0

Patch startup script instead of provding a new one.

3 files changed, 14 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 900a17156b3d..785508759325 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = workcraft
 	pkgdesc = A framework for interpreted graph models including petri nets and STGs
-	pkgver = 3.1.7
+	pkgver = 3.3.0
 	pkgrel = 1
 	url = http://www.workcraft.org/
 	arch = i686
@@ -11,10 +11,8 @@ pkgbase = workcraft
 	optdepends = stack: Concepts support
 	provides = workcraft
 	conflicts = workcraft
-	source = http://www.workcraft.org/_media/download/workcraft-v3.1.7-linux.tar.gz
-	source = workcraft_start.sh
-	md5sums = b3326c927ac84e4f8e886840d6c86fd4
-	md5sums = f32ee62da46bd5fa04ff8ed02f7f218f
+	source = http://www.workcraft.org/_media/download/workcraft-v3.3.0-linux.tar.gz
+	md5sums = 94576e2781dd01bf43d8edad91025d86
 
 pkgname = workcraft
 
diff --git a/PKGBUILD b/PKGBUILD
index 98918f8b2a76..2f807fae0ad5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Adrian Wheeldon <arandomowl at gmail dot com>
 pkgname=workcraft
-pkgver=3.1.7
+pkgver=3.3.0
 pkgrel=1
 pkgdesc="A framework for interpreted graph models including petri nets and STGs"
 arch=('i686' 'x86_64')
@@ -12,13 +12,17 @@ optdepends=(
   'stack: Concepts support')
 provides=('workcraft')
 conflicts=('workcraft')
-source=(http://www.workcraft.org/_media/download/workcraft-v${pkgver}-linux.tar.gz workcraft_start.sh)
+source=(http://www.workcraft.org/_media/download/workcraft-v${pkgver}-linux.tar.gz)
+prepare() {
+  cd "$srcdir"/"$pkgname"
+  sed -i 's|^cd "\$(dirname "\$0")"$|cd \$(dirname "\$(readlink -f \$0)")|' workcraft
+}
 package() {
-  cd $srcdir
+  cd "$srcdir"/"$pkgname"
   mkdir -p "$pkgdir"/usr/bin
   mkdir -p "$pkgdir"/opt/workcraft
-  cp -RP workcraft/* "$pkgdir"/opt/workcraft/
-  cp workcraft_start.sh "$pkgdir"/usr/bin/workcraft
-  chmod 755 "$pkgdir/usr/bin/workcraft"
+  cp -RP ./* "$pkgdir"/opt/workcraft/
+  chmod 755 "$pkgdir"/opt/workcraft/workcraft
+  ln -s /opt/workcraft/workcraft "$pkgdir"/usr/bin/workcraft
 }
-md5sums=('b3326c927ac84e4f8e886840d6c86fd4' 'f32ee62da46bd5fa04ff8ed02f7f218f')
+md5sums=('94576e2781dd01bf43d8edad91025d86')
diff --git a/workcraft_start.sh b/workcraft_start.sh
deleted file mode 100755
index 879e09fa40f2..000000000000
--- a/workcraft_start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh -e
-
-CURRENT_DIR="$PWD"
-
-cd "/opt/workcraft"
-WORKCRAFT_HOME="$PWD"
-
-export CLASSPATH="$WORKCRAFT_HOME/bin/*"
-exec /usr/bin/java org.workcraft.Console -dir:"$CURRENT_DIR" "$@"