[arch-commits] Commit in intellij-idea-community-edition/trunk (3 files)

[Lukas Jirkovsky]

    Date: Friday, March 30, 2018 @ 21:24:01
  Author: stativ
Revision: 313586

upgpkg: intellij-idea-community-edition 2:2018.1-1

update to 2018.1
ensure idea is started with openjdk 8 by default
remove unnecessary cruft from PKGBUILD

Added:
  intellij-idea-community-edition/trunk/idea.sh
Modified:
  intellij-idea-community-edition/trunk/PKGBUILD
  intellij-idea-community-edition/trunk/idea.install

--------------+
 PKGBUILD     |   18 ++++++++----------
 idea.install |   13 +++++++------
 idea.sh      |    5 +++++
 3 files changed, 20 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-30 20:54:54 UTC (rev 313585)
+++ PKGBUILD	2018-03-30 21:24:01 UTC (rev 313586)
@@ -1,8 +1,8 @@
 # $Id$
 # Maintainer: Lukas Jirkovsky <l.jirkovsky at gmail.com>
 pkgname=intellij-idea-community-edition
-pkgver=2017.3.4
-_pkgver=173.4548.28
+pkgver=2018.1
+_pkgver=181.4203.550
 pkgrel=1
 epoch=2
 pkgdesc="IDE for Java, Groovy and other programming languages with advanced refactoring features"
@@ -11,15 +11,16 @@
 license=('Apache')
 backup=('usr/share/intellijidea-ce/bin/idea.vmoptions'
         'usr/share/intellijidea-ce/bin/idea64.vmoptions')
-depends=('java-environment' 'giflib' 'libxtst' 'libxft' 'ttf-font'
+depends=('java-environment=8' 'giflib' 'libxtst' 'libxft' 'ttf-font'
          'coreutils' 'grep' 'which')
 conflicts=('intellij-idea-libs')
 replaces=('intellij-idea-libs')
 install=idea.install
 source=("http://download.jetbrains.com/idea/ideaIC-$pkgver-no-jdk.tar.gz"
-        idea.desktop)
-sha256sums=('eeba2eb6b92fa6eb93c0b0864c0d0fd7b6a1b1d210a1fc2fb32c06f882c84abf'
-            'bd37ad47c926941108f624cbe5adbd7fe91d198b15aca63d8a0c0da14c7a76a6')
+        idea.desktop idea.sh)
+sha256sums=('a8749bf8468ceb0bb957ba88c85eeb1c10a424e2140b1da976cd2d47b2f95426'
+            'bd37ad47c926941108f624cbe5adbd7fe91d198b15aca63d8a0c0da14c7a76a6'
+            '0e5d6a47b5ae464e9f562110ccc798f55055943e425e0621c0275f72615fdb1d')
 
 package() {
   install -d -m755 "$pkgdir/"usr/share
@@ -28,11 +29,8 @@
   # make sure that all files are owned by root
   chown -R root:root "$pkgdir/usr/share"
 
-  # never wait on user input when starting idea
-  sed -i '/.*read IGNORE.*/ d' "$pkgdir"/usr/share/intellijidea-ce/bin/idea.sh
-
   install -d -m755 "$pkgdir"/usr/bin
-  ln -s /usr/share/intellijidea-ce/bin/idea.sh "$pkgdir"/usr/bin/idea.sh
+  install -D -m755 "$srcdir"/idea.sh "$pkgdir"/usr/bin/idea.sh
   install -D -m644 "$srcdir"/idea.desktop "$pkgdir"/usr/share/applications/idea.desktop
   install -D -m644 "$pkgdir"/usr/share/intellijidea-ce/bin/idea.png \
                    "$pkgdir"/usr/share/pixmaps/idea.png

Modified: idea.install
===================================================================
--- idea.install	2018-03-30 20:54:54 UTC (rev 313585)
+++ idea.install	2018-03-30 21:24:01 UTC (rev 313586)
@@ -1,9 +1,10 @@
 post_install() {
-  if [ `pacman -Qsq java-runtime | grep -c openjdk` -ne 0 ]; then
-    echo "WARNING:"
-    echo "  Running IntelliJ IDEA using OpenJDK is officially unsupported"
-    echo "  because of possible performance and graphics problems"
-  fi
+  echo "WARNING:"
+  echo "  Running IntelliJ IDEA with java other than java 8"
+  echo "  may cause various problems, such as Graddle import not working"
 }
 
-# vim:set ts=2 sw=2 et:
+post_upgrade() {
+  post_install
+}
+

Added: idea.sh
===================================================================
--- idea.sh	                        (rev 0)
+++ idea.sh	2018-03-30 21:24:01 UTC (rev 313586)
@@ -0,0 +1,5 @@
+#!/bin/sh
+if [ -z "$IDEA_JDK" ] ; then
+	IDEA_JDK="/usr/lib/jvm/java-8-openjdk/"
+fi
+exec env IDEA_JDK=$IDEA_JDK /usr/share/intellijidea-ce/bin/idea.sh $@


Property changes on: intellij-idea-community-edition/trunk/idea.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property