From: Emil Velikov <emil.l.velikov@gmail.com>
Date: Mon, 2 Sep 2024 17:58:35 +0000 (+0100)
Subject: testsuite: tweak sed/find dance in setup-rootfs.sh
X-Git-Tag: v34~470
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8141ca96ce915cc4cd8463fc5b638f509b7f7be6;p=thirdparty%2Fkmod.git

testsuite: tweak sed/find dance in setup-rootfs.sh

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>
---

diff --git a/testsuite/setup-rootfs.sh b/testsuite/setup-rootfs.sh
index 941500e9..c44cd684 100755
--- a/testsuite/setup-rootfs.sh
+++ b/testsuite/setup-rootfs.sh
@@ -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