a

qa_shell_script/app/XyqbAndroidBuild.sh

@@ -35,24 +35,25 @@ function build_android()
 {
     echo "拷贝可使用的gradle文件"
     cp -r ${source_gradlefile} ${target_file}
-    if [[ -z ${product_flavors} ]]; then
+    if [[ ! -z ${product_flavors} ]]; then
         echo "${product_flavors}" > ${project_path}/markets.txt
     fi
-    rm -rf ${project_path}/apk/
+    rm -rf ${project_path}/apk/*
     echo "开始使用gradle进行编译该版本的代码"
     gradle clean resguard  --stacktrace --debug
     if [ $? = 0 ]; then
         echo "gradle build is ok".
         echo "开始重命名对应的渠道包"
-            #apkfile=`find ${buildapk_path} -name "*${product_flavors}.apk"`
-            apkfile=`grep "${product_flavors} *.apk"`
+        apkfile="`find ${buildapk_path} -name "*${product_flavors}.apk"`"
+        #apkfile=`grep "${product_flavors}" *.apk`
+        #apkfile=`ls ${buildapk_path} | grep "${product_flavors}"`
         echo ${apkfile}
         echo "当前路径"
-            rm -rf ${project_path}/apk/*
+	cd ${buildapk_path}
         pwd
-            mv ${buildapk_path}/${apkfile} ${project_path}/apk/${branch_name}_${product_flavors}.apk
+        mv ${apkfile} ${project_path}/apk/${branch_name}_${product_flavors}.apk
     else
-            echo "Fail to checkout branch ${branch_name}".
+        echo "Fail to build android".
         exit -1
     fi 
 }
@@ -67,5 +68,5 @@ get_code
 
 build_android
 
-upload_apk
+#upload_apk