[jhalfs] branch trunk updated: Allow two names for scriptlet containing "userdel"

This is an automated email from the git hooks/post-receive script.

git pushed a commit to branch trunk
in repository jhalfs.

The following commit(s) were added to refs/heads/trunk by this push:
     new 06b7314  Allow two names for scriptlet containing "userdel"
06b7314 is described below

commit 06b731490f368817ed489800d3409419b2156452
Author: Pierre Labastie <[email protected]>
AuthorDate: Tue Sep 5 13:14:26 2023 +0200

    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
 
 }

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.

-- 
http://lists.linuxfromscratch.org/sympa/info/alfs-discuss
Unsubscribe: See the above information page