summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD4
-rw-r--r--youtrack-workflow-editor.sh13
3 files changed, 16 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5d9ef3cd9e2..90817a4cde1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,7 +12,7 @@ pkgbase = youtrack-workflow-editor
source = youtrack-workflow-editor.sh
source = youtrack-workflow-editor.desktop
sha256sums = f25009b9108e50f2b40df3b0dda6fea39825c8885fad67886d6000765f646e9c
- sha256sums = be320a1d8c56b6fc3feab51a06fbe3acbb7039df842bcda2f3145e9e83f06536
+ sha256sums = 4c8832f46b7f1513834833837a0148cb90803e886e19df550881d7712a5651df
sha256sums = 2aef96faa5351a28ee40db1de3e92a9353fde14a2f2c8490e740d89c3339a8f8
pkgname = youtrack-workflow-editor
diff --git a/PKGBUILD b/PKGBUILD
index 0e9f7fe37f5..60a8243c189 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_build=3384
pkgname=youtrack-workflow-editor
pkgver=6.0
-pkgrel=1
+pkgrel=2
pkgdesc='A MPS-based application to create and edit workflows for YouTrack.'
arch=('any')
url='http://www.jetbrains.com/youtrack/'
@@ -14,7 +14,7 @@ source=("https://download.jetbrains.com/charisma/${pkgname}-${_build}.tar.gz" \
"${pkgname}.sh" \
"${pkgname}.desktop")
sha256sums=('f25009b9108e50f2b40df3b0dda6fea39825c8885fad67886d6000765f646e9c'
- 'be320a1d8c56b6fc3feab51a06fbe3acbb7039df842bcda2f3145e9e83f06536'
+ '4c8832f46b7f1513834833837a0148cb90803e886e19df550881d7712a5651df'
'2aef96faa5351a28ee40db1de3e92a9353fde14a2f2c8490e740d89c3339a8f8')
package() {
diff --git a/youtrack-workflow-editor.sh b/youtrack-workflow-editor.sh
index d2c67165c23..13474bb6a5e 100644
--- a/youtrack-workflow-editor.sh
+++ b/youtrack-workflow-editor.sh
@@ -1,2 +1,15 @@
#!/bin/sh
+
+# Find first instance of Java 6
+JAVA_ENV_NAME=$(archlinux-java status | grep -o -m 1 'java-6.*$')
+if [ -z "$JAVA_ENV_NAME" ]; then
+ # Try Java 5 instead
+ JAVA_ENV_NAME=$(archlinux-java status | grep -o -m 1 'java-5.*$')
+fi
+
+# If we have a JAVA_ENV_NAME then we will use it, otherwise let YouTrack show error.
+if [ -n "$JAVA_ENV_NAME" ]; then
+ export PATH=/usr/lib/jvm/$JAVA_ENV_NAME/jre/bin/:$PATH
+fi
+
exec /usr/share/youtrack-workflow-editor/youtrack-workflow.sh $*