[arch-commits] Commit in interlis-compiler/trunk (PKGBUILD ili2c.sh)

[Alexander Rødseth]

    Date: Monday, October 30, 2017 @ 14:24:20
  Author: arodseth
Revision: 264787

upgpkg: interlis-compiler 4.2.0-5

Modified:
  interlis-compiler/trunk/PKGBUILD
  interlis-compiler/trunk/ili2c.sh

----------+
 PKGBUILD |   16 +++++++++-------
 ili2c.sh |    4 +---
 2 files changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-30 14:10:18 UTC (rev 264786)
+++ PKGBUILD	2017-10-30 14:24:20 UTC (rev 264787)
@@ -1,27 +1,29 @@
 # $Id$
-# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 
 pkgname=interlis-compiler
 pkgver=4.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc='Compiler for INTERLIS 2'
 arch=('any')
 url='http://www.interlis.ch/content/index.php?language=e'
 license=('LGPL')
-depends=('sh' 'java-runtime')
+depends=('java-runtime')
 source=("http://downloads.sourceforge.net/project/umleditor/ili2c/$pkgver/ili2c-$pkgver.zip"
         'ili2c.sh')
 sha256sums=('538cbcf9f01deaad468a27945390b113c922b78e4b78317a872aeae1a739c5d7'
-            '0fcf0177336c5e903267108e99479dcddcced9a01716ed8280b7d264309c9c95')
+            '94b5d6e74d0cbfee09d73d84bad0978bc1d8de1ce8caf18f37c49d44b3da6657')
 
 package() {
   install -d "$pkgdir/opt/ili2c" "$pkgdir/usr/bin"
-  rm -r "$srcdir/ili2c-$pkgver/doc"
-  mv "$srcdir/ili2c-$pkgver/ili2c.jar" "$pkgdir/opt/ili2c/"
   cp -r "$srcdir/ili2c-$pkgver/"* "$pkgdir/opt/ili2c/"
+
+  install -Dm644 "$srcdir/ili2c-$pkgver/ili2c.jar" "$pkgdir/opt/ili2c/ili2c.jar"
   install -Dm755 "$srcdir/ili2c.sh" "$pkgdir/usr/bin/ili2c"
+
+  rm -r "$srcdir/ili2c-$pkgver/doc"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:

Modified: ili2c.sh
===================================================================
--- ili2c.sh	2017-10-30 14:10:18 UTC (rev 264786)
+++ ili2c.sh	2017-10-30 14:24:20 UTC (rev 264787)
@@ -1,4 +1,2 @@
 #!/bin/sh
-CP=$CP:/opt/ili2c/ili2c.jar
-
-/opt/java/jre/bin/java -cp $CP -jar /opt/ili2c/ili2c.jar
+java -cp $CP:/opt/ili2c/ili2c.jar -jar /opt/ili2c/ili2c.jar "$@"