move jbr to a new webstorm-eap-jre package

1 files changed, 14 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index d9ed1c87983b..9913a828446d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,8 @@
 # Contributor: Testuser_01 <arch[at]nico-siebler[dot]de>
 # Contributor: Pablo Vilas <pablovilas89[at]gmail[dot]com>
 
-pkgname=webstorm-eap
+pkgbase=webstorm-eap
+pkgname=(webstorm-eap webstorm-eap-jre)
 _pkgname=WebStorm
 pkgver=213.5744.37
 _pkgver=2021.3
@@ -29,11 +30,14 @@ prepare() {
   rm help/ReferenceCardForMac.pdf
 }
 
+package_webstorm-eap() {
+  optdepends=('webstorm-eap-jre: JetBrains custom Java Runtime (Recommended)'
+              'java-runtime: JRE - Required if webstorm-jre is not installed')
 
-package() {
   cd "${srcdir}"
   mkdir -p "${pkgdir}/opt/${pkgname}"
   cp --recursive ${srcdir}/${_pkgname}-${pkgver}/* "${pkgdir}/opt/${pkgname}"
+  rm -rf "${pkgdir}"/opt/${pkgbase}/jbr
 
   mkdir -p "${pkgdir}/usr/bin"
   mkdir -p "${pkgdir}/usr/share/applications"
@@ -46,3 +50,11 @@ package() {
 
   ln -s "/opt/${pkgname}/bin/webstorm.sh" "${pkgdir}/usr/bin/${pkgname}"
 }
+
+package_webstorm-eap-jre() {
+  pkgdesc="JBR (JetBrains Runtime) for WebStorm EAP - a patched JRE"
+  url='https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime'
+
+  install -dm755 "${pkgdir}"/opt/${pkgbase}
+  cp -a "${srcdir}/${_pkgname}-${pkgver}/jbr" "${pkgdir}/opt/${pkgbase}"
+}