From c98f860009e05b4d3f10b914ade3a5fad1df6b24 Mon Sep 17 00:00:00 2001
From: Thomas Bächler <thomas@archlinux.org>
Date: Sun, 16 Mar 2008 10:55:51 +0100
Subject: Fix various coding style issues

---
 install/autodetect | 10 +++++-----
 install/base       |  6 +++---
 install/firmware   |  8 +++-----
 3 files changed, 11 insertions(+), 13 deletions(-)

(limited to 'install')

diff --git a/install/autodetect b/install/autodetect
index e446a07..8d7da7e 100644
--- a/install/autodetect
+++ b/install/autodetect
@@ -13,14 +13,14 @@ install ()
     findfs ()
     {
         for blkdev in $(find /dev -type b | grep -v -e loop -e ram -e fd); do
-            eval $(/usr/lib/klibc/bin/fstype 2>/dev/null < $blkdev)
-            if [ -n "$FSTYPE" -a "$FSTYPE" != "swap" -a "$FSTYPE" != "unknown" -a "$FSTYPE" != "luks" -a "$FSTYPE" != "lvm2" ]; then
-                echo $FSTYPE
+            eval $(/usr/lib/klibc/bin/fstype 2>/dev/null < ${blkdev})
+            if [ -n "${FSTYPE}" -a "${FSTYPE}" != "swap" -a "${FSTYPE}" != "unknown" -a "${FSTYPE}" != "luks" -a "${FSTYPE}" != "lvm2" ]; then
+                echo ${FSTYPE}
             fi
         done
     }
 
-    if [ $UID -eq 0 -o "$(groups | grep disk)" != "" ]; then
+    if [ ${UID} -eq 0 -o "$(groups | grep disk)" != "" ]; then
         for fs in $(findfs | sort | uniq); do
             for mod in $(find "${MODULEDIR}" -type f -name "${fs}.ko"); do
                 if [ -n "${mod}" ]; then
@@ -44,7 +44,7 @@ install ()
         err "User does not have proper permissions to read superblocks, raid and filesystem modules are not detected"
     fi
 
-    for m in $AUTODETECT; do
+    for m in ${AUTODETECT}; do
         modname="$(basename ${m%%\.ko})"
         grep "^${modname}$" "${MODULE_FILE}" >/dev/null 2>&1 && continue
         case "${m}" in 
diff --git a/install/base b/install/base
index 071e62e..1a5d9bd 100644
--- a/install/base
+++ b/install/base
@@ -12,14 +12,14 @@ install ()
     add_device "/dev/mem"     c 1 1
 
     for f in $(find /lib -name klibc-*.so); do
-        add_file $f
+        add_file ${f}
     done
 
     for f in /usr/lib/klibc/bin/*; do
-        add_file $f /bin/$(basename $f)
+        add_file ${f} /bin/$(basename ${f})
     done
     for f in /usr/lib/klibc/sbin/*; do
-        add_file $f /sbin/$(basename $f)
+        add_file ${f} /sbin/$(basename ${f})
     done
     # add symlink for compatibility
     add_symlink2 /bin/modprobe /sbin/modprobe
diff --git a/install/firmware b/install/firmware
index ca78b80..d03e274 100644
--- a/install/firmware
+++ b/install/firmware
@@ -6,12 +6,10 @@ install ()
     BINARIES=""
     FILES=""
     SCRIPT=""
-   if [ -e /lib/firmware ]; then
-       for i in /lib/firmware/*; do 
-           add_file $i
-       done
+   if [ -d /lib/firmware ]; then
+       add_full_dir /lib/firmware
     else
-            err "No firmware files found!"
+       err "No firmware files found!"
     fi
 }
 
-- 
cgit v1.2.3-24-g4f1b