From 06b731490f368817ed489800d3409419b2156452 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Tue, 5 Sep 2023 13:14:26 +0200 Subject: [PATCH] Allow two names for scriptlet containing "userdel" It used to be named "revised_chroot", it is now named "cleanup" Allow both names by testing whether revised something is present. --- common/libs/func_compare.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/libs/func_compare.sh b/common/libs/func_compare.sh index fb368b8..2b6f9d1 100644 --- a/common/libs/func_compare.sh +++ b/common/libs/func_compare.sh @@ -22,9 +22,11 @@ wrt_compare_targets() { # local dir printf -v dir chapter%02d "$1" - sed -i '/userdel/d' $dir/*revised* + REVISED=cleanup + if ls $dir/*revised* 2>/dev/null; then REVISED=revised; fi + sed -i '/userdel/d' $dir/*$REVISED* for (( N = 2; N < ITERATIONS; N++ )); do - sed -i '/userdel/d' $dir-build_$N/*revised* + sed -i '/userdel/d' $dir-build_$N/*$REVISED* done }