]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
testsuite: tweak sed/find dance in setup-rootfs.sh
authorEmil Velikov <emil.l.velikov@gmail.com>
Mon, 2 Sep 2024 17:58:35 +0000 (18:58 +0100)
committerLucas De Marchi <lucas.de.marchi@gmail.com>
Tue, 3 Sep 2024 01:13:16 +0000 (20:13 -0500)
Instead of doing the exact same search twice and using sub-shells, find
once and -exec the patterns.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/86
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>
testsuite/setup-rootfs.sh

index 941500e9ec314d6ff3434da13e7d6a357c23178f..c44cd68497634270b24363efc9baa7d35125444c 100755 (executable)
@@ -12,14 +12,15 @@ MODULE_DIRECTORY=$6
 # create rootfs from rootfs-pristine
 
 create_rootfs() {
+       local -r SED_PATTERN="s|/lib/modules|$MODULE_DIRECTORY|g;s|$MODULE_DIRECTORY/external|/lib/modules/external|g"
+
        rm -rf "$ROOTFS"
        mkdir -p "$(dirname "$ROOTFS")"
        cp -r "$ROOTFS_PRISTINE" "$ROOTFS"
        find "$ROOTFS" -type d -exec chmod +w {} \;
        find "$ROOTFS" -type f -name .gitignore -exec rm -f {} \;
        if [ "$MODULE_DIRECTORY" != "/lib/modules" ] ; then
-               sed -i -e "s|/lib/modules|$MODULE_DIRECTORY|g" $(find "$ROOTFS" -name \*.txt -o -name \*.conf -o -name \*.dep)
-               sed -i -e "s|$MODULE_DIRECTORY/external|/lib/modules/external|g" $(find "$ROOTFS" -name \*.txt -o -name \*.conf -o -name \*.dep)
+               find "$ROOTFS" \( -name '*.txt' -o -name '*.conf' -o -name '*.dep' \) -exec sed -i -e "$SED_PATTERN" {} +
                for i in "$ROOTFS"/*/lib/modules/* "$ROOTFS"/*/*/lib/modules/* ; do
                        version="$(basename "$i")"
                        [ "$version" != 'external' ] || continue