[incubator-nuttx] 04/05: tools/refresh.sh: Should detect Make.defs from config folder first

[gn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gnutt pushed a commit to branch pr589
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git

commit b19aaa342bfa7f9e2c54651a072dc5f2bafd5f36
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Thu Mar 19 10:56:42 2020 +0800

    tools/refresh.sh: Should detect Make.defs from config folder first
    
    Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
    Change-Id: Ie45d94fb97ea9a17d6fffb42c4ae03b2a6f08459
---
 tools/refresh.sh | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/tools/refresh.sh b/tools/refresh.sh
index d217b76..3765316 100755
--- a/tools/refresh.sh
+++ b/tools/refresh.sh
@@ -38,7 +38,6 @@ USAGE="USAGE: $0 [options] <board>:<config>"
 ADVICE="Try '$0 --help' for more information"
 
 unset CONFIGS
-silent=n
 defaults=n
 prompt=y
 nocopy=n
@@ -49,7 +48,6 @@ while [ ! -z "$1" ]; do
     set -x
     ;;
   --silent )
-    silent=y
     defaults=y
     prompt=n
     ;;
@@ -199,11 +197,11 @@ for CONFIG in ${CONFIGS}; do
     exit 1
   fi
 
-  if [ -r $MAKEDEFS1 ]; then
-    MAKEDEFS=$MAKEDEFS1
+  if [ -r $MAKEDEFS2 ]; then
+    MAKEDEFS=$MAKEDEFS2
   else
-    if [ -r $MAKEDEFS2 ]; then
-      MAKEDEFS=$MAKEDEFS2
+    if [ -r $MAKEDEFS1 ]; then
+      MAKEDEFS=$MAKEDEFS1
     else
       echo "No readable Make.defs file at $MAKEDEFS1 or $MAKEDEFS2"
       exit 1
@@ -247,7 +245,6 @@ for CONFIG in ${CONFIGS}; do
 
   # Show differences
 
-  # sed -i -e "s/^CONFIG_APPS_DIR/# CONFIG_APPS_DIR/g" defconfig
   $CMPCONFIG $DEFCONFIG defconfig
 
   # Save the refreshed configuration