修改获取

518774b9 · app.developer · 3a057921 · 518774b9 · 518774b9 · 518774b9
Commit 518774b9 authored Jan 24, 2019 by app.developer
Hide whitespace changes
Inline Side-by-side

Showing with 32 additions and 26 deletions

ios_package.sh
+1 -4

ipa_script/auto_package_ipa.sh
+18 -12

ipa_script/auto_upload_pgy.sh
+13 -10

No files found.
--- a/ios_package.sh
+++ b/ios_package.sh
@@ -22,8 +22,6 @@ CODE_SOURCE="http://用户名:密码@仓库地址"
 # 脚本仓库
 SCRIPT_SOURCE="http://112.124.100.131/app/iOS-AutoPackage.git"
-# iOS工程 scheme
-IOS_SCHEME=""
 # 蒲公英 API KEY #
 PGY_API_KEY=""
 # 蒲公英 USER KEY #
@@ -50,4 +48,4 @@ cp -r ${WORKSPACE}/${IOS_SCHEME}/Config/Config-${BUILD_ENV}.plist ${WORKSPACE}/$
 BUILD_NUMBER=`/usr/libexec/PlistBuddy -c "Print CFBundleVersion" ${WORKSPACE}/${IOS_SCHEME}/Info.plist`
-sh ${WORKSPACE}/ipa_script/auto_package_ipa.sh ${IOS_SCHEME} ${BUILD_ENV} ${BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_ICON_URL} ${DD_DOWN_URL} ${DD_MESSAGE}
+sh ${WORKSPACE}/ipa_script/auto_package_ipa.sh ${BUILD_ENV} ${BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_ICON_URL} ${DD_DOWN_URL} ${DD_MESSAGE}
\ No newline at end of file
--- a/ipa_script/auto_package_ipa.sh
+++ b/ipa_script/auto_package_ipa.sh
@@ -15,14 +15,20 @@ readonly PROJECT_DIR=$(dirname $(cd "$(dirname "$0")"; pwd))
 # readonly OUTPUT_DIR=${PROJECT_DIR}/fastlane_build/${NOW}
 readonly OUTPUT_DIR=${PROJECT_DIR}/fastlane_build
+PSCHEME_PATH=($(find $PROJECT_DIR -name *.xcodeproj)// /})
+PSCHEME_NAME=${PSCHEME_PATH##*/}
+WSCHEME_PATH=($(find $PROJECT_DIR -name *.xcworkspace)// /})
+WSCHEME_NAME=${WSCHEME_PATH##*/}
 # project scheme name
-readonly EBIZ_SCHEME=$1
+readonly EBIZ_SCHEME=(${PSCHEME_NAME//./ })
-readonly EBIZ_WORKSPACE=$1
+readonly EBIZ_WORKSPACE=(${WSCHEME_NAME//./ })
 # project workspace name
 readonly EBIZ_WORKSPACE_PATH="${PROJECT_DIR}/${EBIZ_WORKSPACE}.xcworkspace"
-readonly EBIZ_BUILD_ENV=$2
+readonly EBIZ_BUILD_ENV=$1
-readonly EBIZ_BUILD_NUMBER=$3
+readonly EBIZ_BUILD_NUMBER=$2
 readonly EBIZ_ENV_COPY_PATH="${PROJECT_DIR}/${EBIZ_SCHEME}/Config/Config-${EBIZ_BUILD_ENV}.plist"
 readonly EBIZ_ENV_PATH="${PROJECT_DIR}/${EBIZ_SCHEME}/Config/Config.plist"
@@ -42,12 +48,12 @@ readonly EBIZ_EXPORT_METHOD="development" # demo 项目没有 app id，打包方
 # readonly EBIZ_EXPORT_METHOD="ad-hoc"    # 正常开发阶段选择 ad-hoc 打包，发布目前是手动打包
 # -----------------------------
-readonly PGY_API_KEY=$4
+readonly PGY_API_KEY=$3
-readonly PGY_USER_KEY=$5
+readonly PGY_USER_KEY=$4
-readonly DD_HOST_URL=$6
+readonly DD_HOST_URL=$5
-readonly DD_ICON_URL=$7
+readonly DD_ICON_URL=$6
-readonly DD_DOWN_URL=$8
+readonly DD_DOWN_URL=$7
-readonly DD_MESSAGE=$9
+readonly DD_MESSAGE=$8
 function echo_log() {
    echo "${COLOR_Cyan}$1${COLOR_Default}"
@@ -106,9 +112,9 @@ echo "===== 包路径：${EBIZ_IPA_PATH} ====="
 # 上传到蒲公英 (以上调试完成后，再打开以下注释)
 if [ "yes" == "$DD_MESSAGE" ]; then
-    sh ${PROJECT_DIR}/ipa_script/auto_upload_pgy.sh ${EBIZ_IPA_PATH} ${EBIZ_SCHEME} ${EBIZ_BUILD_ENV} ${EBIZ_BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_ICON_URL} ${DD_DOWN_URL}
+    sh ${PROJECT_DIR}/ipa_script/auto_upload_pgy.sh ${EBIZ_IPA_PATH} ${EBIZ_BUILD_ENV} ${EBIZ_BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY} ${DD_HOST_URL} ${DD_ICON_URL} ${DD_DOWN_URL}
 else
-    sh ${PROJECT_DIR}/ipa_script/auto_upload_pgy.sh ${EBIZ_IPA_PATH} ${EBIZ_SCHEME} ${EBIZ_BUILD_ENV} ${EBIZ_BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY}
+    sh ${PROJECT_DIR}/ipa_script/auto_upload_pgy.sh ${EBIZ_IPA_PATH} ${EBIZ_BUILD_ENV} ${EBIZ_BUILD_NUMBER} ${PGY_API_KEY} ${PGY_USER_KEY}
 fi

--- a/ipa_script/auto_upload_pgy.sh
+++ b/ipa_script/auto_upload_pgy.sh
@@ -17,12 +17,15 @@ function echo_error() {
 echo_log "===== 打包完成，开始上传到蒲公英 ====="
 NOW=$(date +"%Y_%m_%d_%H_%M_%S")
+PROJECT_PATH=$(dirname $(cd "$(dirname "$0")"; pwd))
+PSCHEME_PATH=($(find $PROJECT_PATH -name *.xcodeproj)// /})
+PSCHEME_NAME=${PSCHEME_PATH##*/}
+EBIZ_SCHEME=(${PSCHEME_NAME//./ })
 EBIZ_IPA_PATH=$1
-EBIZ_SCHEME=$2
+EBIZ_ENV=$2
-EBIZ_ENV=$3
+EBIZ_BUILD_NUMBER=$3
-EBIZ_BUILD_NUMBER=$4
 CURRENT_DIR=$(cd "$(dirname "$0")"; pwd)
-PROJECT_PATH=$(dirname $(cd "$(dirname "$0")"; pwd))
 if [ ! -n "${NOW}" ] ;then
    echo_error "auto-upload 入参 'now' 有误！"
@@ -44,11 +47,11 @@ fi
 # 测试 demo
 # 采蜜 蒲公英 上传 key
-readonly PGY_API_KEY=$5
+readonly PGY_API_KEY=$4
-readonly PGY_USER_KEY=$6
+readonly PGY_USER_KEY=$5
-readonly DD_HOST_URL=$7
+readonly DD_HOST_URL=$6
-readonly DD_ICON_URL=$8
+readonly DD_ICON_URL=$7
-readonly DD_DOWN_URL=$9
+readonly DD_DOWN_URL=$8
 readonly PGY_UPLOAD_SERVER="https://qiniu-storage.pgyer.com/apiv1/app/upload"
@@ -78,7 +81,7 @@ echo_log ${PGY_password}
 # (以上调试完成后，再打开以下注释)
-if [ $# -eq 9 ]; then
+if [ $# -eq 8 ]; then
    python ${CURRENT_DIR}/auto_push_ding_talk.py ${EBIZ_Version} ${EBIZ_APP_Name} ${EBIZ_ENV} ${DD_ICON_URL} ${DD_DOWN_URL} ${DD_HOST_URL} ${PGY_password}
 fi