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

[Antonio Rojas]

    Date: Saturday, June 9, 2018 @ 18:44:59
  Author: arojas
Revision: 342181

Update to 2.5.0

Modified:
  groovy/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-09 18:20:20 UTC (rev 342180)
+++ PKGBUILD	2018-06-09 18:44:59 UTC (rev 342181)
@@ -5,7 +5,7 @@
 # Contributor: Andreas W. Hauser <andy-aur at splashground.de>
 
 pkgname=groovy
-pkgver=2.4.15
+pkgver=2.5.0
 pkgrel=1
 pkgdesc='Programming language based on Java, inspired by Python, Ruby and Smalltalk'
 arch=('any')
@@ -17,7 +17,7 @@
 # .asc file is available for download, but there was no key available
 source=("https://dl.bintray.com/groovy/maven/apache-$pkgname-binary-$pkgver.zip"
         "$pkgname.png::https://raw.githubusercontent.com/apache/incubator-groovy/master/subprojects/groovy-console/src/main/resources/groovy/ui/ConsoleIcon.png")
-sha256sums=('bd4ca37a4d1b3704526d56fc48c119a8f70d418093d8703724407d65250f4aed'
+sha256sums=('13903caed7da4875b2c805ddaa5ac4a3c877342f339700fab9a54b8c628eece3'
             '24e539235b5762b1220f39d7953a52e9b4a458c2be4f66a60219755363ba6dba')
 
 prepare() {
@@ -30,11 +30,8 @@
 
   # Patch the scripts
   for f in "$pkgname-$pkgver/bin/"*; do
-    sed 's:bin/sh:bin/sh\nGROOVY_HOME=/usr/share/groovy\nexport _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=gasp $_JAVA_OPTIONS":' -i "$f"
+    sed 's:bin/env\ sh:bin/env\ sh\nGROOVY_HOME=/usr/share/groovy\nexport _JAVA_OPTIONS="-Dawt.useSystemAAFontSettings=gasp $_JAVA_OPTIONS":' -i "$f"
   done
-
-  cd "$pkgname-$pkgver/embeddable"
-  ln -s "$pkgname-all-$pkgver.jar" "$pkgname-all.jar"
 }
 
 package() {
@@ -42,22 +39,18 @@
 
   # Create the directories and package the files
   install -d "$pkgdir/usr/share/groovy" "$pkgdir/usr/bin"
-  cp -r lib conf embeddable "$pkgdir/usr/share/groovy"
+  cp -r lib conf "$pkgdir/usr/share/groovy"
   cp bin/* "$pkgdir/usr/bin"
+  rm "$pkgdir"/usr/bin/*completion
+  install -Dm644 bin/*completion -t "$pkgdir"/usr/share/bash-completion/completions
 
   # Remove all DOS/Windows batch files
   find $pkgdir -name '*.bat' -exec rm {} \;
 
   # Package the license file
-  install -Dm644 LICENSE \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 
   # Package the desktop shortcut for Groovy Console
-  install -Dm644 "$srcdir/$pkgname.desktop" \
-    "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" \
-    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm644 "$srcdir/$pkgname.desktop" -t "$pkgdir"/usr/share/applications
+  install -Dm644 "$srcdir/$pkgname.png" -t "$pkgdir"/usr/share/pixmaps
 }
-
-# getver: groovy-lang.org/changelogs.html
-# vim: ts=2 sw=2 et: