From 4dbd727be9acf2892fa20bab67eff7bf205f5297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Wed, 18 Feb 2026 12:28:39 +0100 Subject: [PATCH] main/postmarketos-test: do not hardcode 90 as a prefix for _test function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Instead, use shell globbing to find the corresponding file. This allows using the function for the -unl0kr subpackage, and improves the consistency between the filenames Signed-off-by: Pablo Correa Gómez Part-of: --- .../{90-test-suspend.sh => 90-suspend-test.sh} | 0 main/postmarketos-test/APKBUILD | 14 ++++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) rename main/postmarketos-test/{90-test-suspend.sh => 90-suspend-test.sh} (100%) diff --git a/main/postmarketos-test/90-test-suspend.sh b/main/postmarketos-test/90-suspend-test.sh similarity index 100% rename from main/postmarketos-test/90-test-suspend.sh rename to main/postmarketos-test/90-suspend-test.sh diff --git a/main/postmarketos-test/APKBUILD b/main/postmarketos-test/APKBUILD index 8f7961639..d2ce90e96 100644 --- a/main/postmarketos-test/APKBUILD +++ b/main/postmarketos-test/APKBUILD @@ -1,6 +1,6 @@ maintainer="Casey Connolly " pkgname=postmarketos-test -pkgver=1.1.0 +pkgver=1.2.0 pkgrel=0 pkgdesc="Common test utilities for postmarketOS" url="https://postmarketos.org" @@ -9,7 +9,7 @@ license="GPL2" depends="devicepkg-utils" source=" 30-unl0kr-test.sh - 90-test-suspend.sh + 90-suspend-test.sh " options="!check" @@ -32,10 +32,10 @@ _test() { # pmtest subpackage _testname=${subpkgname#postmarketos-test-} - _script="$srcdir/90-test-$_testname.sh" + _script="$srcdir"/*"$_testname"-test.sh - if [ -f "$_script" ]; then - install -Dm755 "$_script" \ + if [ -f $_script ]; then + install -Dm755 $_script \ -t "$subpkgdir"/usr/libexec/pmos-tests-initramfs/ fi } @@ -49,9 +49,7 @@ shell() { unl0kr() { depends="unl0kr" - - install -Dm755 "$srcdir"/30-unl0kr-test.sh \ - -t "$subpkgdir"/usr/libexec/pmos-tests-initramfs/ + _test } sha512sums=" 407180b49c1a05f12bd6ee6e59dca0a6e74fe7b01f195087dcf2865598c47827d0bb569afdba55defa2f9a16437230fa62aa64f35111508b906bcbf9537acba4 30-unl0kr-test.sh