From 804419029ab1b969c8d2dedb9b3443225058521f Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sun, 6 Dec 2015 14:46:11 +0100 Subject: [PATCH] replace run-parts with find|sort to avoid debianutils usage After e75e5879 the reason for an implicit dependency on debianutils (which is essential for debian, but likely not on other systems) was just two uses of run-parts, which can be replaced with the a lot more portable find-piped-into-sort duo. --- cmdline/apt-key.in | 2 +- test/integration/run-tests | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmdline/apt-key.in b/cmdline/apt-key.in index 3c2e2663f..790859e26 100644 --- a/cmdline/apt-key.in +++ b/cmdline/apt-key.in @@ -220,7 +220,7 @@ foreach_keyring_do() { if [ "${STRIPPED_TRUSTEDPARTS}/" = "$TRUSTEDPARTS" ]; then TRUSTEDPARTS="$STRIPPED_TRUSTEDPARTS" fi - for trusted in $(run-parts --list "$TRUSTEDPARTS" --regex '^.*\.gpg$'); do + for trusted in $(find "$TRUSTEDPARTS" -mindepth 1 -maxdepth 1 -regex '^.*\.gpg$' | sort); do if [ -s "$trusted" ]; then $ACTION "$trusted" "$@" fi diff --git a/test/integration/run-tests b/test/integration/run-tests index f2a266139..89c3a10e7 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -83,7 +83,7 @@ PASS=0 ALL=0 FAILED_TESTS="" DIR="$(readlink -f "$(dirname "$0")")" -TESTLIST="$(run-parts --list "$DIR" --regex '^test-.*$')" +TESTLIST="$(find "$DIR" -mindepth 1 -maxdepth 1 -regex '^.*/test-[^/]*$' | sort)" if [ -n "$APT_TEST_JOBS" ]; then if [ "$MSGCOLOR" != 'NO' ]; then export MSGCOLOR='ALWAYS' -- 2.45.2