rewrite pkgbuild and bump version

2 files changed, 36 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c50b0f018708..fb78080092e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,14 @@
 pkgbase = picard-tools
 	pkgdesc = set of tools for working with next generation sequencing data in the BAM format
-	pkgver = 2.23.8
+	pkgver = 2.24.1
 	pkgrel = 1
 	url = https://github.com/broadinstitute/picard
 	arch = x86_64
 	license = MIT
-	depends = java-runtime>=8
-	noextract = picard-tools-2.23.8.jar
-	source = picard-tools-2.23.8.jar::https://github.com/broadinstitute/picard/releases/download/2.23.8/picard.jar
-	source = picard-profile.sh
-	source = picard.sh
-	md5sums = 3d7c2d5fa33063bbd4b656099359cde0
-	md5sums = ebcda2d2c55df6d05994252cf22a68c2
-	md5sums = 0987aa56f62f5e843bfa788cc93626c8
+	makedepends = gradle
+	depends = java-runtime=8
+	source = picard-tools-2.24.1.tar.gz::https://github.com/broadinstitute/picard/archive/2.24.1.tar.gz
+	sha256sums = 90a81f5df465d874e1b5a28a0fb4e2efafb872b5d5e0d726b8a81d3b6f9bb04b
 
 pkgname = picard-tools
 
diff --git a/PKGBUILD b/PKGBUILD
index 70bbf630891a..aff8cd8a8ea4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,45 @@
-# Maintainer: Alexander Peltzer ("alexpe87") <alexpe.aur@mailbox.org>
-# Contributor: Christian Krause ("wookietreiber") <christian.krause@mailbox.org>
+# Maintainer: Grey Christoforo <first name at last name dot net>
 
 pkgname=picard-tools
-pkgver=2.23.8
+pkgver=2.24.1
 pkgrel=1
 pkgdesc='set of tools for working with next generation sequencing data in the BAM format'
 arch=(x86_64)
 url="https://github.com/broadinstitute/picard"
 license=(MIT)
-depends=('java-runtime>=8')
-#makedepends=(gradle)
+depends=('java-runtime=8')
+makedepends=(gradle)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/broadinstitute/picard/archive/${pkgver}.tar.gz")
+sha256sums=('90a81f5df465d874e1b5a28a0fb4e2efafb872b5d5e0d726b8a81d3b6f9bb04b')
 
-#source=("git+https://github.com/broadinstitute/picard.git#tag=${pkgver}")
+prepare(){
+  cd picard-${pkgver}
 
-source=("$pkgname-$pkgver.jar::https://github.com/broadinstitute/picard/releases/download/$pkgver/picard.jar"
-        'picard-profile.sh'
-        'picard.sh')
-noextract=("$pkgname-$pkgver.jar")
-md5sums=('3d7c2d5fa33063bbd4b656099359cde0'
-         'ebcda2d2c55df6d05994252cf22a68c2'
-         '0987aa56f62f5e843bfa788cc93626c8')
+  # disable git repo check
+  sed -i '/file(".git").isDirectory() || (file(".git").exists() && file(".git").text.startsWith("gitdir"))/c\true' -i build.gradle
+  
+  # make the launch script
+  cat <<EOF > picard
+#!/bin/sh
+exec /usr/bin/java -jar '/usr/share/java/picard-tools/picard.jar' "\$@"
+EOF
+}
 
-#build() {
-#  cd picard
-#  gradle shadowJar
-#}
+build() {
+  cd picard-${pkgver}
+  gradle shadowJar
+}
 
-#test(){
-#  cd picard
-#  gradle test
-#}
+check(){
+  cd picard-${pkgver}
+  gradle test
+}
 
 package() {
-  #cd picard
-  install -Dm755 "${srcdir}/picard-profile.sh"    "${pkgdir}/etc/profile.d/picard.sh"
-  install -Dm755 "${srcdir}/picard.sh"            "${pkgdir}/usr/bin/picard"
-  install -Dm755 "${srcdir}/picard-tools-${pkgver}.jar"           "${pkgdir}/usr/share/java/picard-tools/picard.jar"
-  #install -Dm755 "${srcdir}/build/libs/picard.jar" "${pkgdir}/usr/share/java/picard-tools/picard.jar"
-}
+  cd picard-${pkgver}
+
+  install -Dt "${pkgdir}"/usr/share/java/picard-tools -m644 build/libs/picard.jar
+  install -Dt "${pkgdir}"/usr/bin -m755 picard
 
+  install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICENSE.txt
+}