From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 9 Jul 2024 16:52:26 +0000 (+0000)
Subject: archive.files: Make this slightly more efficient
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=822e4cc5b67c036aa6e4784fd1476c931d79dd8a;p=people%2Fms%2Fipfire-2.x.git

archive.files: Make this slightly more efficient

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/scripts/archive.files b/src/scripts/archive.files
index 0645791d5..c512d2f93 100755
--- a/src/scripts/archive.files
+++ b/src/scripts/archive.files
@@ -26,7 +26,7 @@ for i in BUILD_ARCH BUILDTARGET KVER; do
 	fi
 done
 
-FILELIST=
+FILELIST=()
 
 for dir in $@; do
 	# Skip all objects that do not exist.
@@ -34,7 +34,7 @@ for dir in $@; do
 
 	# Files go directly to the rootfile.
 	if [ -f "${dir}" ]; then
-		FILELIST="${FILELIST} ${dir}"
+		FILELIST+=( "${dir}" )
 		continue
 	fi
 
@@ -43,7 +43,7 @@ for dir in $@; do
 		EXCLUDE="$EXCLUDE $exclude"
 	done
 
-	FILELIST="${FILELIST} ${EXCLUDE}"
+	FILELIST+=( "${EXCLUDE}" )
 
 	for include in ${dir}/*; do
 		[ -d ${include} ] && continue
@@ -54,9 +54,9 @@ for dir in $@; do
 				break
 			fi
 		done
-		${IN} && FILELIST="${FILELIST} ${include}"
+		${IN} && FILELIST+=( "${include}" )
 	done
 done
 
-cat ${FILELIST} 2>/dev/null | grep -v ^# | sort | uniq | \
+grep --no-filename -v ^# "${FILELIST[@]}" 2>/dev/null | sort -u | \
 	sed -e "s/KVER/${KVER}/g" -e "s/xxxMACHINExxx/${BUILD_ARCH}/g" -e "s/BUILDTARGET/${BUILDTARGET}/g"