summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Bermond2020-09-08 15:24:39 +0000
committerDaniel Bermond2020-09-08 15:24:39 +0000
commit1d4cf59b86be8d3e6c853e5dbc0c36a6234c83b1 (patch)
treed2cc1bddaf65d78b95ca5591e2b1d473c0b0dd01
parentba93f36dd06a3103c5de53de899b46dba14d5ef4 (diff)
downloadaur-1d4cf59b86be8d3e6c853e5dbc0c36a6234c83b1.tar.gz
Remove null byte warning on package(). Cosmetic changes.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD14
2 files changed, 7 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2e4a3978479..9352df611a7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = izpack-git
pkgdesc = Tool for packaging applications on the Java platform as cross-platform installers (git version)
- pkgver = 5.1.3.r59.ga5e9e8054
+ pkgver = 5.1.3.r60.g34385612d
pkgrel = 1
url = http://izpack.org/
arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 900dc643286..56861389177 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond <dbermond@archlinux.org>
pkgname=izpack-git
-pkgver=5.1.3.r59.ga5e9e8054
+pkgver=5.1.3.r60.g34385612d
pkgrel=1
pkgdesc='Tool for packaging applications on the Java platform as cross-platform installers (git version)'
arch=('any')
@@ -34,16 +34,14 @@ build() {
}
check() {
- mvn -f izpack \
- -Dproject.build.outputTimestamp="$SOURCE_DATE_EPOCH" \
- test
+ mvn -f izpack test
}
package() {
# install
local _ver
- _ver="$(find izpack/izpack-dist/target -type f -name 'izpack-dist-*.jar' -print0 |
- sort -z | head -zn1 | sed -z 's/\.jar$//;s/.*izpack-dist-//')"
+ _ver="$(find izpack/izpack-dist/target -type f -name 'izpack-dist-*.jar' |
+ sort | head -n1 | sed 's/\.jar$//;s/.*izpack-dist-//')"
rm -rf "${pkgdir}/opt/izpack"
printf '%s\n' '0' '1' '1' '1' "${pkgdir}/opt/izpack" \
'O' '1' 'Y' '1' 'N' 'N' 'Y' "${pkgdir}/opt/izpack/auto-install.xml" |
@@ -71,8 +69,8 @@ package() {
local _res
while read -r -d '' _file
do
- _res="$(printf '%s' "$_file" | sed 's/\.png$//;s/^.*_//')"
- _dest="$(printf '%s' "$_file" | sed ";s/_${_res}//;s/_/-/")"
+ _res="$(sed 's/\.png$//;s/^.*_//' <<< "$_file")"
+ _dest="$(sed ";s/_${_res}//;s/_/-/" <<< "$_file")"
mkdir -p "${pkgdir}/usr/share/icons/hicolor/${_res}x${_res}/mimetypes"
ln -s "../../../../../../opt/izpack/icons/${_file}" \
"${pkgdir}/usr/share/icons/hicolor/${_res}x${_res}/mimetypes/${_dest}"