summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rwxr-xr-xPKGBUILD34
2 files changed, 26 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 22a1ad1468b2..61f19e9672d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,13 @@
# Generated by mksrcinfo v8
-# Wed Feb 1 00:47:30 UTC 2017
+# Fri Feb 24 13:01:31 UTC 2017
pkgbase = webstorm
pkgdesc = JavaScript IDE and HTML editor.
pkgver = 2016.3.3
- pkgrel = 1
- url = http://www.jetbrains.com/webstorm/
+ pkgrel = 2
+ url = https://www.jetbrains.com/webstorm/
arch = x86_64
arch = i686
license = Commercial
- optdepends = java-environment>=8: use system java
- optdepends = java-runtime-common: use system java
options = !strip
source = https://download.jetbrains.com/webstorm/WebStorm-2016.3.3.tar.gz
source = jetbrains-webstorm.desktop
@@ -17,4 +15,8 @@ pkgbase = webstorm
sha512sums = e261eb9b7fe61518d3399874492c94b642cb8268861c246692887ef3027380af06b7e692d6733340deebb629a3c8d095364cb6def4071cd5af31cfbfe9ec6b68
pkgname = webstorm
+ optdepends = webstorm-jre: JetBrains custom Java Runtime (Recommended)
+ optdepends = java-runtime>=8: JRE - Required if webstorm-jre is not installed
+
+pkgname = webstorm-jre
diff --git a/PKGBUILD b/PKGBUILD
index cc711c649ef0..a9de29b9b084 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,38 @@
# Contributor: Pablo Vilas <pablovilas89 at gmail dot com>
# Contributor: Testuser_01 <arch@nico-siebler.de>
-pkgname=webstorm
-_pkgname=WebStorm
+pkgbase=webstorm
+pkgname=(webstorm webstorm-jre)
pkgver=2016.3.3
_pkgver=163.12024.17
-pkgrel=1
+pkgrel=2
pkgdesc='JavaScript IDE and HTML editor.'
arch=('x86_64' 'i686')
-url='http://www.jetbrains.com/webstorm/'
-options=('!strip')
license=('Commercial')
-optdepends=('java-environment>=8: use system java'
- 'java-runtime-common: use system java')
-source=(https://download.jetbrains.com/webstorm/${_pkgname}-${pkgver}.tar.gz
+url='https://www.jetbrains.com/webstorm/'
+options=('!strip')
+source=(https://download.jetbrains.com/webstorm/WebStorm-${pkgver}.tar.gz
jetbrains-webstorm.desktop)
sha512sums=('5b48d63f81dcfda947c5208bf16a3114a2100bce3028790e9048099e9b056535b7277eea3fbc1eb64f168c1776bc96147e3f712d4c0f88b65f5f8dc87dbe5ee3'
'e261eb9b7fe61518d3399874492c94b642cb8268861c246692887ef3027380af06b7e692d6733340deebb629a3c8d095364cb6def4071cd5af31cfbfe9ec6b68')
-package() {
+package_webstorm() {
+ optdepends=('webstorm-jre: JetBrains custom Java Runtime (Recommended)'
+ 'java-runtime>=8: JRE - Required if webstorm-jre is not installed')
+
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/
- cp -a ${srcdir}/${_pkgname}-${_pkgver} ${pkgdir}/opt/${pkgname}
- # if you want to use system java you may remove the bundled jre and save about 100M
- #rm -rf ${pkgdir}/opt/${pkgname}/jre
+ rsync -rtl ${srcdir}/WebStorm-${_pkgver}/ ${pkgdir}/opt/${pkgbase} --exclude=/jre
+
+ ln -s /opt/${pkgbase}/bin/${pkgbase}.sh ${pkgdir}/usr/bin/${pkgbase}
+ install -D -m 644 ${srcdir}/jetbrains-${pkgbase}.desktop ${pkgdir}/usr/share/applications/
+ install -D -m 644 ${pkgdir}/opt/${pkgbase}/bin/${pkgbase}.svg ${pkgdir}/usr/share/pixmaps/${pkgbase}.svg
+}
- 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 ${pkgdir}/opt/${pkgname}/bin/${pkgname}.svg ${pkgdir}/usr/share/pixmaps/${pkgname}.svg
+package_webstorm-jre() {
+ install -d -m 755 ${pkgdir}/opt/${pkgbase}
+ rsync -rtl ${srcdir}/WebStorm-${_pkgver}/jre ${pkgdir}/opt/${pkgbase}
}