[arch-commits] Commit in dbeaver/trunk (PKGBUILD)

[Fabio Castelli]

    Date: Monday, March 15, 2021 @ 23:58:59
  Author: muflone
Revision: 891693

upgpkg: dbeaver 21.0.0-2

Modified:
  dbeaver/trunk/PKGBUILD

----------+
 PKGBUILD |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-15 23:29:33 UTC (rev 891692)
+++ PKGBUILD	2021-03-15 23:58:59 UTC (rev 891693)
@@ -3,7 +3,7 @@
 
 pkgname=dbeaver
 pkgver=21.0.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Free universal SQL Client for developers and database administrators (community edition)"
 arch=('x86_64')
 url="https://dbeaver.io/"
@@ -12,7 +12,7 @@
 makedepends=('maven' 'java-runtime<15')
 optdepends=('dbeaver-plugin-office: export data in Microsoft Office Excel format'
             'dbeaver-plugin-svg-format: save diagrams in SVG format')
-source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/serge-rider/dbeaver/archive/${pkgver}.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/dbeaver/dbeaver/archive/${pkgver}.tar.gz"
         "${pkgname}.desktop"
         "${pkgname}.sh"
         "${pkgname}.profile.gz"
@@ -31,11 +31,10 @@
   gzip --decompress --keep --stdout "${pkgname}.profile.gz" | 
     sed "s/DBEAVER_VERSION/${pkgver}/g" |
     gzip -9 > "${pkgname}.profile-${pkgver}.gz"
+
   # Avoid the use of any Java 15, actually incompatible with the build
-  for _java_version in $(archlinux-java status | tail -n +2 | cut -d' ' -f 3 | grep -v 'java-15')
-  do
-    export JAVA_HOME="/usr/lib/jvm/${_java_version}"
-  done
+  export JAVA_HOME="/usr/lib/jvm/$(archlinux-java status | tail -n +2 | sort | cut -d ' ' -f 3 | sort -nr -k 2 -t '-' | grep -v '15-openjdk' -m 1)"
+  
   # Download dependencies during prepare FS#55873
   # https://bugs.archlinux.org/task/55873
   cd "${pkgname}-${pkgver}"