From: sev Date: Thu, 5 Aug 2021 11:00:00 +0000 (-0500) Subject: mympd: bump version, cronwrap: use binary basename X-Git-Url: https://git.sev.monster/aports.git/commitdiff_plain/b24f5dbf99852c46f0949cb74731239fbceae750 mympd: bump version, cronwrap: use binary basename --- diff --git a/testing/cronwrap/APKBUILD b/testing/cronwrap/APKBUILD index 13b4788..73da43d 100644 --- a/testing/cronwrap/APKBUILD +++ b/testing/cronwrap/APKBUILD @@ -1,7 +1,7 @@ # Contributor: sev # Maintainer: sev pkgname=cronwrap -pkgver=1.0.0 +pkgver=1.1.0 pkgrel=0 pkgdesc="Pipe a command's output to a logfile with datestamps" url="https://git.sev.monster/aports.git" @@ -15,5 +15,5 @@ package() { } sha512sums=" -1d89508f7b1683a802e1c3c09794e22c17ab26fec2c3ec7023c588b56a7ed609f111aed917fcd81af11df6c2ec832ca3fe196436cbf9eb609746c07552d46769 cronwrap +ca9ec4833d0bc3e33b63fa511dc324b133da4ba4c04fb7860122242697116c11e0ca95836cf75c9463968e3801523d470defa03d87e23d005f3154a657713a03 cronwrap " diff --git a/testing/cronwrap/cronwrap b/testing/cronwrap/cronwrap index a0e501f..e89a82e 100644 --- a/testing/cronwrap/cronwrap +++ b/testing/cronwrap/cronwrap @@ -2,6 +2,8 @@ set -eu set -o pipefail +_b=$(basename $1) + "$@" 2>&1 \ - | awk "{print strftime(\"%b %d %H:%M:%S `hostname -s` info $1[$$] \"), \$0; fflush();}" \ - | tee -a "/var/log/$1.cron.log" + | awk "{print strftime(\"%b %d %H:%M:%S `hostname -s` info $_b[$$] \"), \$0; fflush();}" \ + | tee -a "/var/log/$_b.cron.log" diff --git a/testing/mympd/APKBUILD b/testing/mympd/APKBUILD index 3a3fc2c..cfe09bd 100644 --- a/testing/mympd/APKBUILD +++ b/testing/mympd/APKBUILD @@ -1,14 +1,14 @@ # Contributor: sev # Maintainer: sev pkgname=mympd -pkgver=7.0.2 +pkgver=8.0.2 pkgrel=1 pkgdesc="myMPD is a standalone and mobile friendly web mpd client with a tiny footprint and advanced features." url="https://jcorporation.github.io" arch="all" license="GPL-2.0-or-later" -depends="libid3tag flac openssl>=1.1.0 lua5.3 pcre" -makedepends="cmake>=3.4 perl pcre-dev openssl-dev>=1.1.0 libid3tag-dev flac-dev lua5.3-dev" +depends="libid3tag flac openssl>=1.1.0 lua5.3-libs pcre" +makedepends="cmake>=3.4 perl libid3tag-dev flac-dev openssl-dev>=1.1.0 linux-headers lua5.3-dev lua5.3-libs pcre-dev" install="$pkgname.pre-install $pkgname.post-install" subpackages="$pkgname-doc $pkgname-openrc" source="myMPD-$pkgver.tar.gz::https://github.com/jcorporation/myMPD/archive/refs/tags/v$pkgver.tar.gz" @@ -26,8 +26,10 @@ check() { # we want to check a specific exit code so we have to turn off errexit set +e for x in config script; do - ./cli_tools/mympd-$x -h >/dev/null 2>&1 - [ $? -ne 1 ] && return 1 + if [ -x cli_tools/mympd-$x ]; then + ./cli_tools/mympd-$x -h >/dev/null 2>&1 + [ $? -ne 1 ] && return 1 + fi done set -e } @@ -39,5 +41,5 @@ package() { } sha512sums=" -98a7464c307797b5b3b3ab56a7dfc2bab47a366e4cc4c48c2239915a14152bd3d6946219ee634baf4a1d36ba92778393100e3e7a16054aa1f85381c34303bd3f myMPD-7.0.2.tar.gz +7a49659fec8f4a6926fdf7d4ede5b625ba7e3a3f48c828b2103313a24582019577d13b2075457f1007c3d57839090eafc0392a0c2b569a74077c5ef0bbb08d7d myMPD-8.0.2.tar.gz "