initiscripts: Fix populate-volatiles.sh whitespace

(From OE-Core rev: d69935fbef2b5a8b187e58ac5ade0ffb9f95f803)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 97 insertions, 110 deletions

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index d2175d7a7c..ab3af70430 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -17,17 +17,17 @@ COREDEF="00_core"
 [ "${VERBOSE}" != "no" ] && echo "Populating volatile Filesystems."
 
 create_file() {
-        EXEC=" 
-        touch \"$1\"; 
-        chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1; 
-        chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 " 
+        EXEC="
+        touch \"$1\";
+        chown ${TUSER}.${TGROUP} $1 || echo \"Failed to set owner -${TUSER}- for -$1-.\" >/dev/tty0 2>&1;
+        chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
 
         test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build
 
         [ -e "$1" ] && {
-          [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
+                [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
         } || {
-          eval $EXEC &
+                eval $EXEC &
         }
 }
 
@@ -38,11 +38,10 @@ mk_dir() {
         chmod ${TMODE} $1 || echo \"Failed to set mode -${TMODE}- for -$1-.\" >/dev/tty0 2>&1 "
 
         test "$VOLATILE_ENABLE_CACHE" = yes && echo "$EXEC" >> /etc/volatile.cache.build
-        
         [ -e "$1" ] && {
-          [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
+                [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
         } || {
-          eval $EXEC
+                eval $EXEC
         }
 }
 
@@ -52,121 +51,109 @@ link_file() {
         test "$VOLATILE_ENABLE_CACHE" = yes && echo "   $EXEC" >> /etc/volatile.cache.build
         
         [ -e "$2" ] && {
-          echo "Cannot create link over existing -${TNAME}-." >&2
+                echo "Cannot create link over existing -${TNAME}-." >&2
         } || {
-          eval $EXEC &
+                eval $EXEC &
         }
 }
 
 check_requirements() {
-
-  cleanup() {
-    rm "${TMP_INTERMED}"
-    rm "${TMP_DEFINED}"
-    rm "${TMP_COMBINED}"
-    }
-    
-  CFGFILE="$1"
-
-  [ `basename "${CFGFILE}"` = "${COREDEF}" ] && return 0
-
-  TMP_INTERMED="${TMPROOT}/tmp.$$"
-  TMP_DEFINED="${TMPROOT}/tmpdefined.$$"
-  TMP_COMBINED="${TMPROOT}/tmpcombined.$$"
-
-
-  cat /etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
-  cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 2 > "${TMP_INTERMED}"
-  cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
-
-  NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`"
-  NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`"
-
-  [ "${NR_DEFINED_USERS}" -ne "${NR_COMBINED_USERS}" ] && {
-    echo "Undefined users:"
-    diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
-    cleanup
-    return 1
-    }
+        cleanup() {
+                rm "${TMP_INTERMED}"
+                rm "${TMP_DEFINED}"
+                rm "${TMP_COMBINED}"
+        }
+        
+        CFGFILE="$1"
+        [ `basename "${CFGFILE}"` = "${COREDEF}" ] && return 0
+
+        TMP_INTERMED="${TMPROOT}/tmp.$$"
+        TMP_DEFINED="${TMPROOT}/tmpdefined.$$"
+        TMP_COMBINED="${TMPROOT}/tmpcombined.$$"
+
+        cat /etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
+        cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 2 > "${TMP_INTERMED}"
+        cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
+        NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`"
+        NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`"
+
+        [ "${NR_DEFINED_USERS}" -ne "${NR_COMBINED_USERS}" ] && {
+                echo "Undefined users:"
+                diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
+                cleanup
+                return 1
+        }
 
 
-  cat /etc/group | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
-  cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 3 > "${TMP_INTERMED}"
-  cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
+        cat /etc/group | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
+        cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 3 > "${TMP_INTERMED}"
+        cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
 
-  NR_DEFINED_GROUPS="`cat "${TMP_DEFINED}" | wc -l`"
-  NR_COMBINED_GROUPS="`cat "${TMP_COMBINED}" | wc -l`"
+        NR_DEFINED_GROUPS="`cat "${TMP_DEFINED}" | wc -l`"
+        NR_COMBINED_GROUPS="`cat "${TMP_COMBINED}" | wc -l`"
 
-  [ "${NR_DEFINED_GROUPS}" -ne "${NR_COMBINED_GROUPS}" ] && {
-    echo "Undefined groups:"
-    diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
-    cleanup
-    return 1
-    }
+        [ "${NR_DEFINED_GROUPS}" -ne "${NR_COMBINED_GROUPS}" ] && {
+                echo "Undefined groups:"
+                diff "${TMP_DEFINED}" "${TMP_COMBINED}" | grep "^>"
+                cleanup
+                return 1
+        }
 
-  # Add checks for required directories here
+        # Add checks for required directories here
 
-  cleanup
-  return 0
-  }
+        cleanup
+        return 0
+}
 
 apply_cfgfile() {
+        CFGFILE="$1"
+
+        check_requirements "${CFGFILE}" || {
+                echo "Skipping ${CFGFILE}"
+                return 1
+        }
 
-  CFGFILE="$1"
-
-  check_requirements "${CFGFILE}" || {
-    echo "Skipping ${CFGFILE}"
-    return 1
-    }
-
-  cat ${CFGFILE} | grep -v "^#" | \
-  while read LINE; do
-
-    eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"`
-
-    [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
-
-
-    [ "${TTYPE}" = "l" ] && {
-      TSOURCE="$TLTARGET"
-      [ -L "${TNAME}" ] || {
-        [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
-        link_file "${TSOURCE}" "${TNAME}" &
-        }
-      continue
-      }
-
-    [ -L "${TNAME}" ] && {
-      [ "${VERBOSE}" != "no" ] && echo "Found link."
-      NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'`
-      echo ${NEWNAME} | grep -v "^/" >/dev/null && {
-        TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}"
-        [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
-        } || {
-        TNAME="${NEWNAME}"
-        [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-."
-        }
-      }
-
-    case "${TTYPE}" in
-      "f")  [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
-            create_file "${TNAME}" &
-            ;;
-      "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
-            mk_dir "${TNAME}"
-            # Add check to see if there's an entry in fstab to mount.
-            ;;
-      *)    [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."
-            continue
-            ;;
-    esac
-
-
-    done
-
-  return 0
-
-  }
+        cat ${CFGFILE} | grep -v "^#" | \
+                while read LINE; do
+                eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"`
+                [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
+
+                [ "${TTYPE}" = "l" ] && {
+                        TSOURCE="$TLTARGET"
+                        [ -L "${TNAME}" ] || {
+                                [ "${VERBOSE}" != "no" ] && echo "Creating link -${TNAME}- pointing to -${TSOURCE}-."
+                                link_file "${TSOURCE}" "${TNAME}" &
+                        }
+                        continue
+                }
+
+                [ -L "${TNAME}" ] && {
+                        [ "${VERBOSE}" != "no" ] && echo "Found link."
+                        NEWNAME=`ls -l "${TNAME}" | sed -e 's/^.*-> \(.*\)$/\1/'`
+                        echo ${NEWNAME} | grep -v "^/" >/dev/null && {
+                                TNAME="`echo ${TNAME} | sed -e 's@\(.*\)/.*@\1@'`/${NEWNAME}"
+                                [ "${VERBOSE}" != "no" ] && echo "Converted relative linktarget to absolute path -${TNAME}-."
+                        } || {
+                                TNAME="${NEWNAME}"
+                                [ "${VERBOSE}" != "no" ] && echo "Using absolute link target -${TNAME}-."
+                        }
+                }
+
+                case "${TTYPE}" in
+                        "f")  [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-."
+                                create_file "${TNAME}" &
+                                ;;
+                        "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
+                                mk_dir "${TNAME}"
+                                # Add check to see if there's an entry in fstab to mount.
+                                ;;
+                        *)    [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."
+                                continue
+                                ;;
+                esac
+        done
+        return 0
+}
 
 clearcache=0
 exec 9</proc/cmdline