include flame in the full flash

moving the variable logic from setup.sh to load-config.sh remove other patch
jan-os · Apr 15, 2014 · 6a65886 · 6a65886
1 parent 4f399b7
commit 6a65886
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/config.sh b/config.sh
@@ -122,7 +122,7 @@ case "$1" in
 
 "flame")
 	echo PRODUCT_NAME=$1 >> .tmp-config &&
-	repo_sync $1
+       repo_sync $1
 	;;
 
 "fugu")

diff --git a/flash.sh b/flash.sh
@@ -333,7 +333,7 @@ case "$DEVICE" in
 	exit $?
 	;;
 
-"otoro"|"unagi"|"keon"|"peak"|"inari"|"sp8810ea"|"wasabi"|"flatfish")
+"flame"|"otoro"|"unagi"|"keon"|"peak"|"inari"|"sp8810ea"|"wasabi"|"flatfish")
 	flash_fastboot nounlock $PROJECT
 	;;
 

diff --git a/load-config.sh b/load-config.sh
@@ -18,3 +18,8 @@ fi
 if [ -z $GECKO_PATH ]; then
   GECKO_PATH=$B2G_DIR/gecko
 fi
+
+VARIANT=${VARIANT:-eng}
+PRODUCT_NAME=${PRODUCT_NAME:-full_${DEVICE}}
+DEVICE=${DEVICE:-${PRODUCT_NAME}}
+LUNCH=${LUNCH:-${PRODUCT_NAME}-${VARIANT}}
diff --git a/setup.sh b/setup.sh
@@ -2,11 +2,6 @@
 
 . load-config.sh
 
-VARIANT=${VARIANT:-eng}
-PRODUCT_NAME=${PRODUCT_NAME:-full_${DEVICE}}
-DEVICE=${DEVICE:-${PRODUCT_NAME}}
-LUNCH=${LUNCH:-${PRODUCT_NAME}-${VARIANT}}
-
 export USE_CCACHE=yes &&
 export GECKO_PATH &&
 export GAIA_PATH &&