summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrederik2016-03-19 01:45:21 +0100
committerfrederik2016-03-19 01:45:21 +0100
commitb31bdad56232768299d3ceda217097d5fc68ec9c (patch)
treed80b2f9875ee5c72c78459b815598f382b4e15e7
parentc4fb087e81e02fae23d46650f0a8e57c1b906f8d (diff)
downloadaur-b31bdad56232768299d3ceda217097d5fc68ec9c.tar.gz
auto detect system java
-rw-r--r--.SRCINFO4
-rwxr-xr-xPKGBUILD5
-rw-r--r--webstorm.sh6
3 files changed, 8 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50b9dcbd12f..e7a521f8d77 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Fri Mar 18 20:11:38 UTC 2016
+# Sat Mar 19 00:44:44 UTC 2016
pkgbase = webstorm
pkgdesc = JavaScript IDE and HTML editor.
pkgver = 2016.1
- pkgrel = 2
+ pkgrel = 3
url = http://www.jetbrains.com/webstorm/
arch = x86_64
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 3e0bff11da2..44a4ce5332c 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=webstorm
_pkgname=WebStorm
pkgver=2016.1
_pkgver=145.258.3
-pkgrel=2
+pkgrel=3
pkgdesc="JavaScript IDE and HTML editor."
arch=('x86_64' 'i686')
options=('!strip')
@@ -29,9 +29,8 @@ package() {
install -d -m 755 ${pkgdir}/etc/profile.d/
cp -a ${srcdir}/${_pkgname}-${_pkgver} $pkgdir/opt/${pkgname}
- # to force system java, have a look at /etc/profile.d/${pkgname}.sh
# if using system java you may remove the bundled jre and save about 100M
- rm -rf $pkgdir/opt/${pkgname}/jre
+ #rm -rf $pkgdir/opt/${pkgname}/jre
ln -s /opt/$pkgname/bin/${pkgname}.sh $pkgdir/usr/bin/${pkgname}
install -D -m 644 ${srcdir}/jetbrains-${pkgname}.desktop ${pkgdir}/usr/share/applications/
diff --git a/webstorm.sh b/webstorm.sh
index a067a026dcb..f038a67fe19 100644
--- a/webstorm.sh
+++ b/webstorm.sh
@@ -1,2 +1,4 @@
-# uncomment to use Arch JRE/JDK
-#export WEBIDE_JDK=/usr/lib/jvm/default
+# use Arch JRE/JDK for webstorm
+if [ -d /usr/lib/jvm/default ]; then
+ export WEBIDE_JDK=/usr/lib/jvm/default
+fi