summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrederik2016-03-18 21:12:07 +0100
committerfrederik2016-03-18 21:12:07 +0100
commitc4fb087e81e02fae23d46650f0a8e57c1b906f8d (patch)
tree60ce86a2ea33ecf15ce693786895d27fa17f9529
parent4c847b6f5baf497905954a0365564f791c395ac7 (diff)
downloadaur-c4fb087e81e02fae23d46650f0a8e57c1b906f8d.tar.gz
change java to optdepend and provide ability to force system java
-rw-r--r--.SRCINFO9
-rwxr-xr-xPKGBUILD16
-rw-r--r--webstorm.sh2
3 files changed, 20 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9d589e645ab..50b9dcbd12f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,22 @@
# Generated by mksrcinfo v8
-# Thu Mar 17 13:36:37 UTC 2016
+# Fri Mar 18 20:11:38 UTC 2016
pkgbase = webstorm
pkgdesc = JavaScript IDE and HTML editor.
pkgver = 2016.1
- pkgrel = 1
+ pkgrel = 2
url = http://www.jetbrains.com/webstorm/
arch = x86_64
arch = i686
license = Commercial
- depends = java-environment>=6
+ optdepends = java-environment>=6: use system java
+ optdepends = java-runtime-common: use system java
options = !strip
source = https://download.jetbrains.com/webstorm/WebStorm-2016.1.tar.gz
source = jetbrains-webstorm.desktop
+ source = webstorm.sh
sha256sums = 0e14107d7527a6d204e42e39b436f3f8fe05a787c1cf63b13c2f286c85d46787
sha256sums = df1155779ec87c1f9e3237a2b79a0bea1242f4f2661d3d0f5f152ef24af93166
+ sha256sums = 803093f27b726fbd9feba542b9c5e481b95624e0d96c11b3025a12bc600ed545
pkgname = webstorm
diff --git a/PKGBUILD b/PKGBUILD
index a91f0183dd3..3e0bff11da2 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,27 +6,35 @@ pkgname=webstorm
_pkgname=WebStorm
pkgver=2016.1
_pkgver=145.258.3
-pkgrel=1
+pkgrel=2
pkgdesc="JavaScript IDE and HTML editor."
arch=('x86_64' 'i686')
options=('!strip')
url="http://www.jetbrains.com/${pkgname}/"
license=('Commercial')
-depends=('java-environment>=6')
+optdepends=('java-environment>=6: use system java'
+ 'java-runtime-common: use system java')
source=(https://download.jetbrains.com/webstorm/${_pkgname}-${pkgver}.tar.gz
- jetbrains-webstorm.desktop)
+ jetbrains-webstorm.desktop
+ webstorm.sh)
sha256sums=('0e14107d7527a6d204e42e39b436f3f8fe05a787c1cf63b13c2f286c85d46787'
- 'df1155779ec87c1f9e3237a2b79a0bea1242f4f2661d3d0f5f152ef24af93166')
+ 'df1155779ec87c1f9e3237a2b79a0bea1242f4f2661d3d0f5f152ef24af93166'
+ '803093f27b726fbd9feba542b9c5e481b95624e0d96c11b3025a12bc600ed545')
package() {
install -d -m 755 ${pkgdir}/opt/
install -d -m 755 ${pkgdir}/usr/bin/
install -d -m 755 ${pkgdir}/usr/share/applications/
install -d -m 755 ${pkgdir}/usr/share/pixmaps/
+ 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
ln -s /opt/$pkgname/bin/${pkgname}.sh $pkgdir/usr/bin/${pkgname}
install -D -m 644 ${srcdir}/jetbrains-${pkgname}.desktop ${pkgdir}/usr/share/applications/
+ install -D -m 644 ${srcdir}/${pkgname}.sh ${pkgdir}/etc/profile.d/
install -D -m 644 "${pkgdir}/opt/${pkgname}/bin/${pkgname}.svg" "${pkgdir}/usr/share/pixmaps/${pkgname}.svg"
}
diff --git a/webstorm.sh b/webstorm.sh
new file mode 100644
index 00000000000..a067a026dcb
--- /dev/null
+++ b/webstorm.sh
@@ -0,0 +1,2 @@
+# uncomment to use Arch JRE/JDK
+#export WEBIDE_JDK=/usr/lib/jvm/default