merge_config.sh: improve indentation

It is true that we do not want to move the code too far to the
right, but something like below is not preferred:

    if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
    echo Value of $CFG is redefined by fragment $MERGE_FILE:
    echo Previous  value: $PREV_VAL
    echo New value:       $NEW_VAL
    echo
    elif [ "$WARNREDUN" = "true" ]; then
    echo Value of $CFG is redundant by fragment $MERGE_FILE:
    fi

To fix this, call "continue" if the "grep" command fails to find the
given CONFIG.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>

1 files changed, 6 insertions, 8 deletions

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 88d89b2986db..56584b107bf8 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -103,20 +103,18 @@ for MERGE_FILE in $MERGE_LIST ; do
         CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
 
         for CFG in $CFG_LIST ; do
-                grep -q -w $CFG $TMP_FILE
-                if [ $? -eq 0 ] ; then
-                        PREV_VAL=$(grep -w $CFG $TMP_FILE)
-                        NEW_VAL=$(grep -w $CFG $MERGE_FILE)
-                        if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
+                grep -q -w $CFG $TMP_FILE || continue
+                PREV_VAL=$(grep -w $CFG $TMP_FILE)
+                NEW_VAL=$(grep -w $CFG $MERGE_FILE)
+                if [ "x$PREV_VAL" != "x$NEW_VAL" ] ; then
                         echo Value of $CFG is redefined by fragment $MERGE_FILE:
                         echo Previous  value: $PREV_VAL
                         echo New value:       $NEW_VAL
                         echo
-                        elif [ "$WARNREDUN" = "true" ]; then
+                elif [ "$WARNREDUN" = "true" ]; then
                         echo Value of $CFG is redundant by fragment $MERGE_FILE:
-                        fi
-                        sed -i "/$CFG[ =]/d" $TMP_FILE
                 fi
+                sed -i "/$CFG[ =]/d" $TMP_FILE
         done
         cat $MERGE_FILE >> $TMP_FILE
 done