feat: Support productFlavor

README.md

@@ -124,7 +124,7 @@ npx upload-pgy --no-android
 npx upload-pgy --no-ios
 
 # 安卓默认打包release版本，可以改成debug版本
-npx upload-pgy --debug
+npx upload-pgy --variant=debug
 ```
 
 ### fir.im
@@ -139,7 +139,7 @@ npx upload-fir --no-android
 npx upload-fir --no-ios
 
 # 安卓默认打包release版本，可以改成debug版本
-npx upload-fir --debug
+npx upload-fir  --variant=debug
 ```
 
 ### App Store
@@ -164,6 +164,9 @@ npx upload-tf
 ### 同时打包android和ios
 ```bash
 npx upload-build --ios-export-plist path/to/xxx.plist
+
+# 安卓默认打包release版本，可以改成debug版本
+npx upload-build --ios-export-plist path/to/xxx.plist --variant=debug
 ```
 
 

src/build-android.sh

@@ -12,8 +12,10 @@ libs=$dir/libs
 
 echo -e "\n\033[32mBuilding android app...\033[0m\n"
 
-pack_type=$(node $libs/pack-type.js "$@")
+eval $(node $libs/pack-type.js "$@")
+# pack_variant=
+# pack_output_path=
 
-bash $libs/build-android.sh $pack_type
+bash $libs/build-android.sh $pack_variant
 
-echo -e "\nView apk file at: \033[32m./android/app/build/outputs/apk/$pack_type\033[0m\n"
+echo -e "\nView apk file at: \033[32m./android/app/build/outputs/apk/$pack_output_path\033[0m\n"

src/build.sh

@@ -23,13 +23,16 @@ ios_app_save_dir=./ios/build/app-$(date +%Y-%m-%d-%H-%M-%S)
 
 echo -e "\n\033[32mBuilding android app...\033[0m\n"
 
-pack_type=$(node $libs/pack-type.js "$@")
-bash $libs/build-android.sh $pack_type
+eval $(node $libs/pack-type.js "$@")
+# pack_variant=
+# pack_output_path=
+
+bash $libs/build-android.sh $pack_variant
 
 echo -e "\n\033[32mBuilding ios app...\033[0m\n"
 
 bash $libs/archive.sh
 bash $libs/export-ipa.sh $ios_export_plist  $ios_app_save_dir
 
-echo -e "\nView apk file at: \033[32m./android/app/build/outputs/apk/release\033[0m"
+echo -e "\nView apk file at: \033[32m./android/app/build/outputs/apk/$pack_output_path\033[0m"
 echo -e "\nView ipa file at: \033[32m$ios_app_save_dir\033[0m\n"

src/libs/build-android.sh

@@ -2,19 +2,14 @@
 
 set -e
 
-pack_type=$1
+pack_variant=$1
 
 # Build for android
 # The apk file will be at
 # android/app/build/outputs/apk/app-release.apk
 cd android
 rm -rf build/ app/build/
 
-if [ $pack_type = "debug" ]
-then
-    ./gradlew assembleDebug
-else
-    ./gradlew assembleRelease
-fi
+eval "./gradlew assemble$pack_variant"
 
 cd -

src/libs/pack-type.js

@@ -2,10 +2,16 @@ const minimist = require('minimist');
 
 const args = minimist(process.argv.slice(2));
 
-let releaseType = 'release';
-
-if (args.debug === true) {
-    releaseType = 'debug';
+if (!args.variant || typeof args.variant !== 'string') {
+    args.variant = 'release';
 }
 
-console.log(releaseType);
+// path is case-insensitive on macos
+const packVariant = args.variant.toLowerCase();
+
+console.log(
+    `
+    pack_variant=${packVariant}
+    pack_output_path=${packVariant.replace(/^(.*)(release|debug)$/, '$1/$2')}
+    `
+);

src/upload-fir.sh

@@ -25,11 +25,13 @@ else
   echo -e "\033[32m[$log_prefix] Building android app...\033[0m"
   sleep 1
 
-  pack_type=$(node $libs/pack-type.js "$@")
+  eval $(node $libs/pack-type.js "$@")
+  # pack_variant=
+  # pack_output_path=
 
-  sh $libs/build-android.sh $pack_type
+  sh $libs/build-android.sh $pack_variant
 
-  android_app=$(ls -l ./android/app/build/outputs/apk/$pack_type/*.apk | tail -n 1 | awk '{print $NF}')
+  android_app=$(ls -l ./android/app/build/outputs/apk/$pack_output_path/*.apk | tail -n 1 | awk '{print $NF}')
   apk_info=$(node $libs/apk-info.js $android_app)
   eval "$apk_info"
 fi

src/upload-pgy.sh

@@ -33,10 +33,12 @@ else
   echo -e "\033[32m[$log_prefix] Building android app...\033[0m"
   sleep 1
 
-  pack_type=$(node $libs/pack-type.js "$@")
+  eval $(node $libs/pack-type.js "$@")
+  # pack_variant=
+  # pack_output_path=
 
-  sh $libs/build-android.sh $pack_type
-  android_app=$(ls -l ./android/app/build/outputs/apk/$pack_type/*.apk | tail -n 1 | awk '{print $NF}')
+  sh $libs/build-android.sh $pack_variant
+  android_app=$(ls -l ./android/app/build/outputs/apk/$pack_output_path/*.apk | tail -n 1 | awk '{print $NF}')
 fi
 
 if [ $ios -eq 0 ]