fix(convertfs): shellcheck for modules.d/30convertfs

diff --git a/modules.d/30convertfs/.shchkdir b/modules.d/30convertfs/.shchkdir
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/modules.d/30convertfs/convertfs.sh b/modules.d/30convertfs/convertfs.sh
index d947ca3d285355fcfee657ac502d067b0f29fbf4..20cbe4b030e0d7a64b7727f683ff24f3838e5ab7 100755 (executable)
--- a/modules.d/30convertfs/convertfs.sh
+++ b/modules.d/30convertfs/convertfs.sh
@@ -19,16 +19,16 @@ while [[ $ROOT != "${ROOT%/}" ]]; do
     ROOT=${ROOT%/}
 done
 
-if [ ! -L $ROOT/var/run -a -e $ROOT/var/run ]; then
+if [ ! -L "$ROOT"/var/run -a -e "$ROOT"/var/run ]; then
     echo "Converting /var/run to symlink"
-    mv -f $ROOT/var/run $ROOT/var/run.runmove~
-    ln -sfn ../run $ROOT/var/run
+    mv -f "$ROOT"/var/run "$ROOT"/var/run.runmove~
+    ln -sfn ../run "$ROOT"/var/run
 fi
 
-if [ ! -L $ROOT/var/lock -a -e $ROOT/var/lock ]; then
+if [ ! -L "$ROOT"/var/lock -a -e "$ROOT"/var/lock ]; then
     echo "Converting /var/lock to symlink"
-    mv -f $ROOT/var/lock $ROOT/var/lock.lockmove~
-    ln -sfn ../run/lock $ROOT/var/lock
+    mv -f "$ROOT"/var/lock "$ROOT"/var/lock.lockmove~
+    ln -sfn ../run/lock "$ROOT"/var/lock
 fi
 
 needconvert() {
@@ -54,7 +54,7 @@ fi
 
 testfile="$ROOT/.usrmovecheck$$"
 rm -f -- "$testfile"
-> "$testfile"
+: > "$testfile"
 if [[ ! -e $testfile ]]; then
     echo "Cannot write to $ROOT/"
     exit 1
@@ -63,7 +63,7 @@ rm -f -- "$testfile"
 
 testfile="$ROOT/usr/.usrmovecheck$$"
 rm -f -- "$testfile"
-> "$testfile"
+: > "$testfile"
 if [[ ! -e $testfile ]]; then
     echo "Cannot write to $ROOT/usr/"
     exit 1
@@ -71,9 +71,9 @@ fi
 rm -f -- "$testfile"
 
 find_mount() {
-    local dev mnt etc wanted_dev
-    wanted_dev="$(readlink -e -q $1)"
-    while read dev mnt etc || [ -n "$dev" ]; do
+    local dev wanted_dev
+    wanted_dev="$(readlink -e -q "$1")"
+    while read -r dev _ || [ -n "$dev" ]; do
         [ "$dev" = "$wanted_dev" ] && echo "$dev" && return 0
     done < /proc/mounts
     return 1
@@ -92,7 +92,7 @@ else
             return 1
         fi
 
-        while read a m a || [ -n "$m" ]; do
+        while read -r _ m _ || [ -n "$m" ]; do
             [ "$m" = "$1" ] && return 0
         done < /proc/mounts
         return 1
@@ -137,6 +137,7 @@ for dir in bin sbin lib lib64; do
     # delete all symlinks that have been backed up
     find "$ROOT/usr/${dir}.usrmove-new" -type l -name '*.usrmove~' -delete || :
     # replace symlink with backed up binary
+    # shellcheck disable=SC2156
     find "$ROOT/usr/${dir}.usrmove-new" \
         -name '*.usrmove~' \
         -type f \
@@ -174,17 +175,20 @@ for dir in bin sbin lib lib64; do
 done
 
 for dir in bin sbin lib lib64; do
-    [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]] \
-        && rm -rf -- "$ROOT/usr/${dir}.usrmove-old~" || :
-    [[ -d "$ROOT/${dir}.usrmove-old~" ]] \
-        && rm -rf -- "$ROOT/${dir}.usrmove-old~" || :
+    if [[ -d "$ROOT/usr/${dir}.usrmove-old~" ]]; then
+        rm -rf -- "$ROOT/usr/${dir}.usrmove-old~"
+    fi
+
+    if [[ -d "$ROOT/${dir}.usrmove-old~" ]]; then
+        rm -rf -- "$ROOT/${dir}.usrmove-old~"
+    fi
 done
 
 for dir in lib lib64; do
     [[ -d "$ROOT/$dir" ]] || continue
-    for lib in "$ROOT"/usr/${dir}/lib*.so*.usrmove~; do
+    for lib in "$ROOT"/usr/"${dir}"/lib*.so*.usrmove~; do
         [[ -f $lib ]] || continue
-        mv $lib ${lib/.so/_so}
+        mv "$lib" "${lib/.so/_so}"
     done
 done
 
@@ -193,10 +197,14 @@ set +e
 echo "Run ldconfig."
 ldconfig -r "$ROOT"
 
-. $ROOT/etc/selinux/config
-if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts ]; then
+if [[ -f "$ROOT"/etc/selinux/config ]]; then
+    # shellcheck disable=SC1090
+    . "$ROOT"/etc/selinux/config
+fi
+
+if [ -n "$(command -v setfiles)" ] && [ "$SELINUX" != "disabled" ] && [ -f /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts ]; then
     echo "Fixing SELinux labels"
-    setfiles -r $ROOT -p /etc/selinux/${SELINUXTYPE}/contexts/files/file_contexts $ROOT/sbin $ROOT/bin $ROOT/lib $ROOT/lib64 $ROOT/usr/lib $ROOT/usr/lib64 $ROOT/etc/ld.so.cache $ROOT/var/cache/ldconfig || :
+    setfiles -r "$ROOT" -p /etc/selinux/"${SELINUXTYPE}"/contexts/files/file_contexts "$ROOT"/sbin "$ROOT"/bin "$ROOT"/lib "$ROOT"/lib64 "$ROOT"/usr/lib "$ROOT"/usr/lib64 "$ROOT"/etc/ld.so.cache "$ROOT"/var/cache/ldconfig || :
 fi
 
 echo "Done."