launcher now explicitly calls bash, general clean-up of PKGBUILD

2 files changed, 17 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1d7cbd9e802..5a59bac32195 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,10 @@
 pkgbase = epubcheck
 	pkgdesc = A tool to validate IDPF Epub files.
 	pkgver = 4.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/IDPF/epubcheck
 	arch = any
-	groups = inform
 	license = BSD
-	makedepends = gzip
 	depends = java-environment
 	source = https://github.com/IDPF/epubcheck/releases/download/v4.0.1/epubcheck-4.0.1.zip
 	md5sums = e5834be417b8e9ddcdb1498929ecd41e
diff --git a/PKGBUILD b/PKGBUILD
index b78405c57120..fc4ff7546a40 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,32 @@
 # Contributor: James Thomas <dairy_water at yahoo dot co dot uk>
 pkgname=epubcheck
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool to validate IDPF Epub files."
-arch=(any)
+arch=('any')
 url="https://github.com/IDPF/epubcheck"
 license=('BSD')
-groups=(inform)
 depends=('java-environment')
-makedepends=('gzip')
 source=(https://github.com/IDPF/epubcheck/releases/download/v${pkgver}/${pkgname}-${pkgver}.zip)    
 md5sums=('e5834be417b8e9ddcdb1498929ecd41e')
 
 package() {
-    mkdir -p $pkgdir/usr/share/${pkgname}
+    mkdir -p $pkgdir/usr/share/java/${pkgname}
+    mkdir -p $pkgdir/usr/share/java/${pkgname}/lib
+    mkdir -p $pkgdir/usr/share/docs/${pkgname}
+    mkdir -p $pkgdir/usr/share/licenses/${pkgname}
+    
+    cp $srcdir/${pkgname}-${pkgver}/epubcheck.jar $pkgdir/usr/share/java/${pkgname}
+    cp $srcdir/${pkgname}-${pkgver}/lib/*.jar $pkgdir/usr/share/java/${pkgname}/lib
+    cp $srcdir/${pkgname}-${pkgver}/*.txt $pkgdir/usr/share/docs/${pkgname}
+    cp $srcdir/${pkgname}-${pkgver}/licenses/BSD-3-Clause.txt $pkgdir/usr/share/licenses/${pkgname}/LICENSE
+    
     mkdir -p $pkgdir/usr/bin
     
-    cp -fr $srcdir/${pkgname}-${pkgver}/* $pkgdir/usr/share/${pkgname}
-	
-    echo "java -jar /usr/share/epubcheck/epubcheck.jar \"\$1\"" > $pkgdir/usr/bin/${pkgname}
-	
+    cat >> $pkgdir/usr/bin/${pkgname} << EOF 
+#!/bin/bash
+exec java -jar /usr/share/java/epubcheck/epubcheck.jar "\$@"
+EOF
     chmod +x $pkgdir/usr/bin/${pkgname}
-  
-    install -D -m0644 $pkgdir/usr/share/epubcheck/licenses/BSD-3-Clause.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }