summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorkaptoxic2017-09-20 16:56:13 -0400
committerkaptoxic2017-09-20 16:56:13 -0400
commita9dc852c995a9942c5bf7a389a2e1f5ee3d5107e (patch)
tree85ae64f0140762df106f4e3678f4be70b0813136
parent1ed90501d3e70112c5513b3656bafc33e2b7878f (diff)
parentdaef55dcc0964b0ad7dff5344fcfd0cfb9a4f29a (diff)
downloadaur-a9dc852c995a9942c5bf7a389a2e1f5ee3d5107e.tar.gz
Merge branch 'master' of ssh://aur4.archlinux.org/checkstyle
-rw-r--r--.gitignore5
-rw-r--r--PKGBUILD31
-rw-r--r--checkstyle2
3 files changed, 23 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..243ddebc03ba
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+src/
+pkg/
+*.tar.gz
+*.pkg.tar.xz
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 4fff86d48831..39f5eec4e487 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
# Maintainer: kaptoxic@yahoo.com
-
-# Contributor: Jaime Gil de Sagredo <jaimegildesagredo@gmail.com
+# Maintainer: Marcin (CTRL) Wieczorek <marcin@marcin.co>
+# Contributor: Jaime Gil de Sagredo <jaimegildesagredo@gmail.com>
pkgname='checkstyle'
pkgver='8.2'
pkgrel=1
pkgdesc='A tool to help programmers write Java code that adheres to a coding standard'
-depends=('java-environment')
-arch=('i686' 'x86_64')
-license=('LGPL2')
+arch=('any')
+license=('LGPL2.1')
+depends=('java-runtime>=8')
+makedepends=('maven' 'java-environment>=8')
url='http://checkstyle.sourceforge.net'
source=(
"https://sourceforge.net/projects/checkstyle/files/checkstyle/${pkgver}/${pkgname}-${pkgver}-bin.tar.gz/download"
@@ -16,14 +17,16 @@ source=(
md5sums=('1a61a8dd39e8886fe59ec350686a033f'
'2059277aee1e877eab1d127a0110d1c3')
-function package() {
- local destdir="${pkgdir}/opt/${pkgname}"
- local bindir="${pkgdir}/usr/bin"
-
- mkdir -pv ${destdir}
- mkdir -pv ${bindir}
-
- cp -r "${srcdir}/${pkgname}-${pkgver}"/* ${destdir}
+build() {
+ cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}/"
+ mvn -Passembly clean package
+}
- install -m755 "${srcdir}/${pkgname}" ${bindir}
+package() {
+ cd "${srcdir}/${pkgname}-${pkgname}-${pkgver}/"
+ mkdir -p "${pkgdir}/usr/share/${pkgname}/"
+ mkdir -p "${pkgdir}/usr/bin/"
+ install -D -m755 "${srcdir}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+ install -D -m644 "${srcdir}/${pkgname}-${pkgname}-${pkgver}/target/${pkgname}-${pkgver}-all.jar" "${pkgdir}/usr/share/${pkgname}/${pkgname}.jar"
+ install -D -m644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
}
diff --git a/checkstyle b/checkstyle
index 3b169cb17e37..2b326d635fa0 100644
--- a/checkstyle
+++ b/checkstyle
@@ -1,3 +1,3 @@
#!/bin/bash
-java -jar /opt/checkstyle/checkstyle-6.18-all.jar $@
+java -jar /usr/share/checkstyle/checkstyle.jar $@