upgpkg: webstorm-eap 211.5787.16-1

- upstream release
- replaced symlink in /usr/bin with launcher script (launch from symlink is broken
  in this release)

3 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6683388af02a..01a484bc9892 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = webstorm-eap
 	pkgdesc = JavaScript IDE and HTML editor. Early Access Program.
-	pkgver = 211.5538.3
+	pkgver = 211.5787.16
 	pkgrel = 1
 	url = http://www.jetbrains.com/webstorm
 	arch = i686
 	arch = x86_64
 	license = custom
 	options = !strip
-	source = https://download.jetbrains.com/webstorm/WebStorm-211.5538.3.tar.gz
-	source = https://download.jetbrains.com/webstorm/WebStorm-211.4961.31.tar.gz
+	source = https://download.jetbrains.com/webstorm/WebStorm-211.5787.16.tar.gz
+	source = webstorm-eap.sh
 	source = jetbrains-webstorm-eap.desktop
 	source = WebStorm_license.txt
-	sha256sums = fee273cdb00aa0708d7b44b5515191635badf3651289c6be2610baacb1f030af
-	sha256sums = 5675221f57dcc250ca5b77565d573eea70e2a3571598d2648d72924c30b0027c
+	sha256sums = 829b27a97649463371ac61de8f79ead1b1d20b1a52f56608618d7f1e805fa6f2
+	sha256sums = 5d71fec58a85d936a24fce93f9e95339cf276902a646da1f2982267fe926a7ed
 	sha256sums = e8d1be7f980b7d371ef5aa65f2375397d970e887659bf3b280601cced8498e32
 	sha256sums = 8464fc766dbb4f6a0de4acd84007fc2916b50ca48ce7d22654144f549c8c6f4c
 
diff --git a/PKGBUILD b/PKGBUILD
index 44fcf4b21495..7c69259ce22b 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=webstorm-eap
 _pkgname=WebStorm
-pkgver=211.5538.3
+pkgver=211.5787.16
 _pkgver=2021.1
 pkgrel=1
 pkgdesc="JavaScript IDE and HTML editor. Early Access Program."
@@ -15,12 +15,12 @@ license=('custom')
 depends=()
 
 source=(https://download.jetbrains.com/webstorm/${_pkgname}-${pkgver}.tar.gz
-        https://download.jetbrains.com/webstorm/${_pkgname}-211.4961.31.tar.gz
+        webstorm-eap.sh
         jetbrains-webstorm-eap.desktop
         ${_pkgname}_license.txt)
 
-sha256sums=('fee273cdb00aa0708d7b44b5515191635badf3651289c6be2610baacb1f030af'
-            '5675221f57dcc250ca5b77565d573eea70e2a3571598d2648d72924c30b0027c'
+sha256sums=('829b27a97649463371ac61de8f79ead1b1d20b1a52f56608618d7f1e805fa6f2'
+            '5d71fec58a85d936a24fce93f9e95339cf276902a646da1f2982267fe926a7ed'
             'e8d1be7f980b7d371ef5aa65f2375397d970e887659bf3b280601cced8498e32'
             '8464fc766dbb4f6a0de4acd84007fc2916b50ca48ce7d22654144f549c8c6f4c')
 
@@ -39,9 +39,6 @@ prepare() {
     rm bin/webstorm.vmoptions
     rm -rf lib/pty4j-native/linux/x86
   fi
-
-  # The JBR of this version is broken, see https://youtrack.jetbrains.com/issue/JBR-3066
-  rm -rf jbr
 }
 
 package() {
@@ -53,11 +50,11 @@ package() {
   mkdir -p "${pkgdir}/usr/share/applications"
   mkdir -p "${pkgdir}/usr/share/pixmaps"
   mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-  ln -s /opt/${pkgname}/bin/webstorm.sh "${pkgdir}"/usr/bin/${pkgname}
+
   install -m 644 "${startdir}/jetbrains-${pkgname}.desktop" "${pkgdir}/usr/share/applications"
   install -m 644 "${pkgdir}/opt/${pkgname}/bin/webstorm.svg" "${pkgdir}/usr/share/pixmaps/${pkgname}.svg"
   install -m 644 "${startdir}/${_pkgname}_license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/${_pkgname}_license.txt"
 
-  echo 'Using the JBR from build 211.4961.31...'
-  cp -r "${srcdir}/${_pkgname}-211.4961.31/jbr" "${pkgdir}/opt/${pkgname}/jbr"
+  # Install binary (start from symlink is broken since 211.5787.16)
+  install -Dm 755 "webstorm-eap.sh" "${pkgdir}/usr/bin/${pkgname}"
 }
diff --git a/webstorm-eap.sh b/webstorm-eap.sh
new file mode 100644
index 000000000000..a336102b1ad2
--- /dev/null
+++ b/webstorm-eap.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /opt/webstorm-eap/bin/webstorm.sh "$@"
\ No newline at end of file