Working installation

3 files changed, 18 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd373c31ae20..5d131be2a9f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = workcraft-git
 	pkgdesc = A framework for interpreted graph models including petri nets and STGs
-	pkgver = 3.1.2
+	pkgver = r2434.f520e4b
 	pkgrel = 1
 	url = http://www.workcraft.org/
 	arch = i686
@@ -14,7 +14,7 @@ pkgbase = workcraft-git
 	source = git+https://github.com/tuura/workcraft.git
 	source = workcraft_start.sh
 	md5sums = SKIP
-	md5sums = 48f63dfedeeaac4dd8ccde2d2822fefc
+	md5sums = 83d559be23be014bbb68bef45e1aedb3
 
 pkgname = workcraft-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ac2284ab2b5..3b51419cbe6d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Adrian Wheeldon <arandomowl at gmail dot com>
 pkgname=workcraft-git
-pkgver=3.1.2
+pkgver=r2434.f520e4b
 pkgrel=1
 pkgdesc="A framework for interpreted graph models including petri nets and STGs"
 arch=('i686' 'x86_64')
@@ -11,20 +11,24 @@ depends=('java-runtime')
 provides=('workcraft')
 conflicts=('workcraft')
 source=(git+https://github.com/tuura/workcraft.git workcraft_start.sh)
-md5sums=('SKIP' '48f63dfedeeaac4dd8ccde2d2822fefc')
+md5sums=('SKIP' '83d559be23be014bbb68bef45e1aedb3')
 pkgver() {
-	cd "$srcdir/${pkgname%-VCS}"
+	cd "$srcdir/${pkgname%-git}"
 	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 build() {
-	cd "$srcdir/${pkgname%-VCS}"
-	./gradlew assemble
+	cd "$srcdir/${pkgname%-git}"
+	if [ -e "/usr/bin/gradle" ]; then
+		/usr/bin/gradle assemble	# Use current gradle installation if available
+	else
+		./gradlew assemble
+	fi
 }
 package() {
-	cd "$srcdir/${pkgname%-git}"
-	mkdir -p "${pkgdir%-git}"/usr/bin
-	mkdir -p "${pkgdir%-git}"/opt/workcraft
-	cp -RP workcraft/* "${pkgdir%-git}"/opt/workcraft/
-	cp workcraft_start.sh "${pkgdir%-git}"/usr/bin/workcraft
-	chmod 755 "${pkgdir%-git}/usr/bin/workcraft"
+	cd "$srcdir"
+	mkdir -p "${pkgdir}"/usr/bin
+	mkdir -p "${pkgdir}"/opt/workcraft
+	cp -RP "${pkgname%-git}"/* "${pkgdir}"/opt/workcraft/
+	cp workcraft_start.sh "${pkgdir}"/usr/bin/workcraft
+	chmod 755 "${pkgdir}/usr/bin/workcraft"
 }
diff --git a/workcraft_start.sh b/workcraft_start.sh
index b09785fe3c5a..ff98c9e4a36b 100755
--- a/workcraft_start.sh
+++ b/workcraft_start.sh
@@ -3,7 +3,5 @@
 CURRENT_DIR="$PWD"
 
 cd "/opt/workcraft"
-WORKCRAFT_HOME="$PWD"
-
-export CLASSPATH="$WORKCRAFT_HOME/workcraft.jar:$WORKCRAFT_HOME/plugins/*"
+export CLASSPATH="$(ls -1 */build/libs/*.jar | tr '\n' ':')"
 exec /usr/bin/java org.workcraft.Console -dir:"$CURRENT_DIR" "$@"