push version to 11.0.0

5 files changed, 43 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 92fc817d6885..1fc90a4aebe7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = webstorm
 	pkgdesc = JavaScript IDE and HTML editor.
-	pkgver = 10.0.4
-	pkgrel = 3
+	pkgver = 11.0.0
+	pkgrel = 1
 	url = http://www.jetbrains.com/webstorm
-	arch = i686
 	arch = x86_64
+	arch = i686
 	license = custom
 	depends = java-environment
 	options = !strip
-	source = http://download.jetbrains.com/webstorm/WebStorm-10.0.4.tar.gz
-	source = jetbrains-webstorm
+	source = https://download.jetbrains.com/webstorm/WebStorm-11.0.0.tar.gz
 	source = jetbrains-webstorm.desktop
-	sha256sums = f2c6b6fde74513858f204a6fc5d4f39a6b3424edcc1abc435e566ead0929319c
-	sha256sums = 152a0b551a7955837d0e249b24c69d37282633751fc0f5fc68145edcb7c74711
-	sha256sums = ff6de45a3972370ddd70baf4155f6572c45191ec7723990ed56faf67e26feac6
+	source = webstorm.install
+	sha256sums = ae8ae6ec6f3b400b1df4d999fcb6efc80435e630e8e8f80bba4771ac7c59f771
+	sha256sums = df1155779ec87c1f9e3237a2b79a0bea1242f4f2661d3d0f5f152ef24af93166
+	sha256sums = a12071f48cfaa0fa41bf5ebf4d977366ca142329938183139adb044078b2f105
 
 pkgname = webstorm
 
diff --git a/PKGBUILD b/PKGBUILD
index 695003d61ca2..732c2eb3a56d 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,41 +4,40 @@
 
 pkgname=webstorm
 _pkgname=WebStorm
-pkgver=10.0.4
-_pkgver=141.1550
-pkgrel=3
+pkgver=11.0.0
+_pkgver=143.381.46
+pkgrel=1
 pkgdesc="JavaScript IDE and HTML editor."
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 options=('!strip')
 url="http://www.jetbrains.com/${pkgname}"
 license=('custom')
 depends=('java-environment')
-source=(http://download.jetbrains.com/webstorm/${_pkgname}-${pkgver}.tar.gz
-        jetbrains-webstorm
-        jetbrains-webstorm.desktop)
-sha256sums=('f2c6b6fde74513858f204a6fc5d4f39a6b3424edcc1abc435e566ead0929319c'
-            '152a0b551a7955837d0e249b24c69d37282633751fc0f5fc68145edcb7c74711'
-            'ff6de45a3972370ddd70baf4155f6572c45191ec7723990ed56faf67e26feac6')
+source=(https://download.jetbrains.com/webstorm/${_pkgname}-${pkgver}.tar.gz
+        jetbrains-webstorm.desktop
+        webstorm.install)
+sha256sums=('ae8ae6ec6f3b400b1df4d999fcb6efc80435e630e8e8f80bba4771ac7c59f771'
+            'df1155779ec87c1f9e3237a2b79a0bea1242f4f2661d3d0f5f152ef24af93166'
+            'a12071f48cfaa0fa41bf5ebf4d977366ca142329938183139adb044078b2f105')
 
 package() {
-  cd "${srcdir}"
-  mkdir -p "${pkgdir}/opt/${pkgname}"
-  cp -r ${srcdir}/${_pkgname}-${_pkgver}/* "${pkgdir}/opt/${pkgname}"
+  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 [[ $CARCH = 'i686' ]]; then
-    rm -f "${pkgdir}/opt/${pkgname}/bin/libyjpagent-linux64.so"
-    rm -f "${pkgdir}/opt/${pkgname}/bin/fsnotifier64"
+     rm -f ${pkgdir}/opt/${pkgname}/bin/libyjpagent-linux64.so
+     rm -f ${pkgdir}/opt/${pkgname}/bin/fsnotifier64
   fi
   if [[ $CARCH = 'x86_64' ]]; then
-    rm -f "${pkgdir}/opt/${pkgname}/bin/libyjpagent-linux.so"
-    rm -f "${pkgdir}/opt/${pkgname}/bin/fsnotifier"
+     rm -f ${pkgdir}/opt/${pkgname}/bin/libyjpagent-linux.so
+     rm -f ${pkgdir}/opt/${pkgname}/bin/fsnotifier
   fi
 
-  mkdir -p "${pkgdir}/usr/bin"
-  mkdir -p "${pkgdir}/usr/share/applications"
-  mkdir -p "${pkgdir}/usr/share/pixmaps"
-  mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -m 644 "${startdir}/jetbrains-${pkgname}.desktop" "${pkgdir}/usr/share/applications"
-  install -m 644 "${pkgdir}/opt/${pkgname}/bin/webide.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
-  install -m 644 "${srcdir}/${_pkgname}-${_pkgver}/license/${_pkgname}_license.txt" "${pkgdir}/usr/share/licenses/${pkgname}/${_pkgname}_license.txt"
-  install -m 755 "${startdir}/jetbrains-${pkgname}" "${pkgdir}/usr/bin"
+  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/webstorm.svg" "${pkgdir}/usr/share/pixmaps/webstorm.svg"
 }
diff --git a/jetbrains-webstorm b/jetbrains-webstorm
deleted file mode 100755
index c48f57acae75..000000000000
--- a/jetbrains-webstorm
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/opt/webstorm/bin/webstorm.sh $@
diff --git a/jetbrains-webstorm.desktop b/jetbrains-webstorm.desktop
index e5ef4cbdae50..35cccc90f629 100755..100644
--- a/jetbrains-webstorm.desktop
+++ b/jetbrains-webstorm.desktop
@@ -2,7 +2,7 @@
 Version=1.0
 Type=Application
 Name=WebStorm
-Icon=/opt/webstorm/bin/webide.png
+Icon=/opt/webstorm/bin/webstorm.svg
 Exec="/opt/webstorm/bin/webstorm.sh" %f
 Comment=Develop with pleasure!
 Categories=Development;IDE;
diff --git a/webstorm.install b/webstorm.install
new file mode 100644
index 000000000000..2b84b6ec1cb9
--- /dev/null
+++ b/webstorm.install
@@ -0,0 +1,10 @@
+post_install() {
+  echo
+  echo "You can buy a license after the 30-day trial period here:"
+  echo "https://www.jetbrains.com/webstorm/buy/"
+  echo
+}
+
+post_upgrade() {
+  post_install
+}