upgpkg: datagrip 2019.2.6-1

upstream release

2 files changed, 21 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b2be6530cd2b..b2022b163d9e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,16 @@
 pkgbase = datagrip
 	pkgdesc = Smart SQL Editor and Advanced Database Client Packed Together for Optimum Productivity
-	pkgver = 2019.2.5
+	pkgver = 2019.2.6
 	pkgrel = 1
 	url = http://www.jetbrains.com/datagrip/
 	arch = any
 	license = Commercial
-	makedepends = rsync
 	conflicts = 0xdbe
 	conflicts = 0xdbe-eap
 	options = !strip
-	source = https://download.jetbrains.com/datagrip/datagrip-2019.2.5.tar.gz
+	source = https://download.jetbrains.com/datagrip/datagrip-2019.2.6.tar.gz
 	source = jetbrains-datagrip.desktop
-	sha512sums = 880e8b3fd2c6bb6dfb8f21350e1860e56be090f06c47e49b7df6d73a21fa5acd7839965f85cdce549e93cb2c9bbc48d967bce0a3618bf7b9d33c0dc56f7bee2f
+	sha512sums = 79661f0833c26663646f1dbb07a8ab1808be329c179c6f25f7293db421ad01b5d5b874f9f233df3cafe6e3f1826282e02fcfa09184ade65108460b12219d343a
 	sha512sums = 4172c0c7065a91148c7b5b2bec1f84572fc7d302cd63e2f132f66297fd96c3969c403975a1eec93ec5d931406a7631fd9972222752d924338ed2b2cee44ba052
 
 pkgname = datagrip
@@ -19,4 +18,6 @@ pkgname = datagrip
 	optdepends = java-runtime: JRE - Required if datagrip-jre is not installed
 
 pkgname = datagrip-jre
+	pkgdesc = JBR (JetBrains Runtime) for DataGrip - a patched JDK
+	url = https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime
 
diff --git a/PKGBUILD b/PKGBUILD
index 9ec4bd6a3b31..b4688e133f58 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,37 +2,40 @@
 
 pkgbase=datagrip
 pkgname=(datagrip datagrip-jre)
-pkgver=2019.2.5
+pkgver=2019.2.6
 pkgrel=1
 pkgdesc='Smart SQL Editor and Advanced Database Client Packed Together for Optimum Productivity'
 arch=('any')
 url='http://www.jetbrains.com/datagrip/'
 license=('Commercial')
-makedepends=('rsync')
 conflicts=('0xdbe' '0xdbe-eap')
 options=('!strip')
 source=(https://download.jetbrains.com/${pkgbase}/${pkgbase}-${pkgver}.tar.gz
         jetbrains-datagrip.desktop)
-sha512sums=('880e8b3fd2c6bb6dfb8f21350e1860e56be090f06c47e49b7df6d73a21fa5acd7839965f85cdce549e93cb2c9bbc48d967bce0a3618bf7b9d33c0dc56f7bee2f'
+sha512sums=('79661f0833c26663646f1dbb07a8ab1808be329c179c6f25f7293db421ad01b5d5b874f9f233df3cafe6e3f1826282e02fcfa09184ade65108460b12219d343a'
             '4172c0c7065a91148c7b5b2bec1f84572fc7d302cd63e2f132f66297fd96c3969c403975a1eec93ec5d931406a7631fd9972222752d924338ed2b2cee44ba052')
 
 package_datagrip() {
   optdepends=('datagrip-jre: JetBrains custom Java Runtime (Recommended)'
               'java-runtime: JRE - Required if datagrip-jre is not installed')
 
-  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/"
+  install -dm755 "${pkgdir}"/opt/
+  install -dm755 "${pkgdir}"/usr/bin/
+  install -dm755 "${pkgdir}"/usr/share/applications/
+  install -dm755 "${pkgdir}"/usr/share/pixmaps/
 
-  rsync -rtl "${srcdir}/DataGrip-${pkgver}/" "${pkgdir}/opt/${pkgbase}" --exclude=/jbr
+  cp -a "${srcdir}"/DataGrip-${pkgver}/ "${pkgdir}"/opt/${pkgbase}
+  rm -rf "${pkgdir}"/opt/${pkgbase}/jbr
 
-  ln -s "/opt/${pkgbase}/bin/${pkgbase}.sh" "${pkgdir}/usr/bin/${pkgbase}"
-  install -D -m 644 "${srcdir}/jetbrains-${pkgbase}.desktop" "${pkgdir}/usr/share/applications/"
-  install -D -m 644 "${pkgdir}/opt/${pkgbase}/bin/${pkgbase}.svg" "${pkgdir}/usr/share/pixmaps/${pkgbase}.svg"
+  ln -s /opt/${pkgbase}/bin/${pkgbase}.sh "${pkgdir}"/usr/bin/${pkgbase}
+  install -m644 "${srcdir}"/jetbrains-${pkgbase}.desktop "${pkgdir}"/usr/share/applications/
+  install -m644 "${pkgdir}"/opt/${pkgbase}/bin/${pkgbase}.svg "${pkgdir}"/usr/share/pixmaps/${pkgbase}.svg
 }
 
 package_datagrip-jre() {
-  install -d -m 755 "${pkgdir}/opt/${pkgbase}"
-  rsync -rtl "${srcdir}/DataGrip-${pkgver}/jbr" "${pkgdir}/opt/${pkgbase}"
+  pkgdesc='JBR (JetBrains Runtime) for DataGrip - a patched JDK'
+  url='https://confluence.jetbrains.com/display/JBR/JetBrains+Runtime'
+
+  install -dm755 "${pkgdir}"/opt/${pkgbase}
+  cp -a "${srcdir}"/DataGrip-${pkgver}/jbr "${pkgdir}"/opt/${pkgbase}
 }