From 382803ac48352654a741c3ea0fb54751320c104f Mon Sep 17 00:00:00 2001
From: debuggerx <dx8917312@163.com>
Date: Wed, 28 Apr 2021 14:51:18 +0800
Subject: [PATCH] feat: set mode to "release" when run flutter with "build"
 option; unset flavor options before pass to flutter command.

---
 bin/parse_arguments.dart | 10 +++++++++-
 flutter.sh               | 16 +++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/bin/parse_arguments.dart b/bin/parse_arguments.dart
index f1f4b97..dd9e542 100644
--- a/bin/parse_arguments.dart
+++ b/bin/parse_arguments.dart
@@ -12,13 +12,18 @@ class Args {
 }
 
 Args parse(arguments) {
-  var args = Args('debug', 'default', false);
+  var args = Args('', 'default', false);
   for (var value in arguments) {
     if (value == '--release') {
       args.mode = 'release';
     } else if (value == '--debug') {
       args.mode = 'debug';
     }
+
+    if (args.mode == '' && value == 'build') {
+      args.mode = 'release';
+    }
+
     if (value == '--flavor') {
       args.flavor = arguments[arguments.indexOf('--flavor') + 1];
     }
@@ -26,6 +31,9 @@ Args parse(arguments) {
       args.isReplaceMode = true;
     }
   }
+  if (args.mode == '') {
+    args.mode = 'debug';
+  }
   print(args);
   return args;
 }
diff --git a/flutter.sh b/flutter.sh
index 8b929ee..020b20a 100644
--- a/flutter.sh
+++ b/flutter.sh
@@ -12,6 +12,20 @@ do
    [ "$i" == "--replace" ] && JUST_REPLACE=1
 done
 
+echo Original args is : [ "$@" ]
+ARGS=("$@")
+
+UNSET_NEXT=0
+INDEX=0
+for i in ${ARGS[*]}
+    do
+        [ 1 == $UNSET_NEXT ] && UNSET_NEXT=0 && unset ARGS[$INDEX]
+        [ "--flavor" == "$i" ] && UNSET_NEXT=1 && unset ARGS[$INDEX]
+        ((INDEX++))
+    done
+
+echo Passed args is : [ "${ARGS[*]}" ]
+
 if [[ ! -x "$DART_EXE" ]]; then
   echo "Can't find dart executable file !"
 fi
@@ -36,7 +50,7 @@ ${DART_EXE} "$SCRIPT_DIR"/bin/pre_script.dart "$@"
 
 if [[ "$JUST_REPLACE" == 0 ]]; then
 
-  flutter "$@"
+  flutter ${ARGS[*]}
 
   ${DART_EXE} "$SCRIPT_DIR"/bin/after_script.dart "$@"