From 760fdf3bd23107369b254117ef5e2273478f27f2 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 15 Apr 2021 09:21:48 +0200 Subject: [PATCH] jenkins-build-all: fix failure when trying to rm a dir + for f in metadata/*/signatures/* ++++ dirname metadata/de.schildbach.wallet/signatures/370 +++ dirname metadata/de.schildbach.wallet/signatures ++ basename metadata/de.schildbach.wallet Wed 14 Apr 2021 11:50:34 PM UTC - cleanup in progress... Wed 14 Apr 2021 11:50:34 PM UTC - cleanup done. + appid=de.schildbach.wallet ++ basename metadata/de.schildbach.wallet/signatures/370 + versionCode=370 + rm -f repo/de.schildbach.wallet_427.apk repo/de.schildbach.wallet_427.apk.asc repo/de.schildbach.wallet_427.log.gz repo/de.schildbach.wallet_test repo/de.schildbach.wallet_test_427.apk repo/de.schildbach.wallet_test_427.apk.asc repo/de.schildbach.wallet_test_427.log.gz 'archive/de.schildbach.wallet_*' 'unsigned/de.schildbach.wallet_*' rm: cannot remove 'repo/de.schildbach.wallet_test': Is a directory --- jenkins-build-all | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins-build-all b/jenkins-build-all index 282a4ab6..e6bbeccc 100755 --- a/jenkins-build-all +++ b/jenkins-build-all @@ -99,13 +99,13 @@ printf '\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\nbuild all with reproducible signatures for f in metadata/*/signatures/*; do appid=$(basename $(dirname $(dirname $f))) versionCode=$(basename $f) - rm -f repo/${appid}_* archive/${appid}_* unsigned/${appid}_* + rm -f repo/${appid}_*.* archive/${appid}_*.* unsigned/${appid}_*.* $WORKSPACE/fdroid build --verbose --latest --no-tarball ${appid}:$versionCode done printf '\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\nbuild all with Binaries:\n' for appid in `grep '^Binaries: ' metadata/*.yml --files-with-match | sed 's,^metadata/\(.*\)\.yml$,\1,'`; do - rm -f repo/${appid}_* archive/${appid}_* unsigned/${appid}_* + rm -f repo/${appid}_*.* archive/${appid}_*.* unsigned/${appid}_*.* $WORKSPACE/fdroid build --verbose --latest --no-tarball ${appid} done