]> git.ipfire.org Git - thirdparty/kmod.git/commitdiff
testsuite: sprinkle more quotation marks 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:12:33 +0000 (20:12 -0500)
... as highlighted by shellcheck.

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 bd36d9ca9987888fc3b4b837f5504a745be10ee2..941500e9ec314d6ff3434da13e7d6a357c23178f 100755 (executable)
@@ -13,7 +13,7 @@ MODULE_DIRECTORY=$6
 
 create_rootfs() {
        rm -rf "$ROOTFS"
-       mkdir -p $(dirname "$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 {} \;
@@ -21,11 +21,11 @@ create_rootfs() {
                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)
                for i in "$ROOTFS"/*/lib/modules/* "$ROOTFS"/*/*/lib/modules/* ; do
-                       version="$(basename $i)"
-                       [ $version != 'external' ] || continue
-                       mod="$(dirname $i)"
-                       lib="$(dirname $mod)"
-                       up="$(dirname $lib)$MODULE_DIRECTORY"
+                       version="$(basename "$i")"
+                       [ "$version" != 'external' ] || continue
+                       mod="$(dirname "$i")"
+                       lib="$(dirname "$mod")"
+                       up="$(dirname "$lib")$MODULE_DIRECTORY"
                        mkdir -p "$up"
                        mv "$i" "$up"
                done
@@ -33,15 +33,15 @@ create_rootfs() {
 
        if [ "$SYSCONFDIR" != "/etc" ]; then
                find "$ROOTFS" -type d -name etc -printf "%h\n" | while read -r e; do
-                       mkdir -p "$(dirname $e/$SYSCONFDIR)"
-                       mv $e/{etc,$SYSCONFDIR}
+                       mkdir -p "$(dirname "$e/$SYSCONFDIR")"
+                       mv "$e"/{etc,"$SYSCONFDIR"}
                done
        fi
 }
 
 feature_enabled() {
        local feature=$1
-       grep KMOD_FEATURES  $CONFIG_H | head -n 1 | grep -q \+$feature
+       grep KMOD_FEATURES "$CONFIG_H" | head -n 1 | grep -q \+"$feature"
 }
 
 declare -A map
@@ -169,7 +169,7 @@ fi
 
 if feature_enabled ZSTD; then
        for m in "${zstd_array[@]}"; do
-           zstd --rm $ROOTFS/$m
+           zstd --rm "$ROOTFS/$m"
        done
 fi