From 4eac9a196053da10678d3ee5f982f1843fa738f1 Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Mon, 19 Jul 2021 13:18:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/AutoBuild_Function.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index faedced..6298279 100755 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -355,13 +355,13 @@ AddPackage() { PKG_DIR=$2 PKG_NAME=$3 REPO_URL="https://github.com/$4" - [[ -z $5 ]] && { - TIME "WARNING: Missing ,will use default branch: [master]" - REPO_BRANCH=master - } || REPO_BRANCH=$5 + REPO_BRANCH=$5 [[ ${REPO_URL} =~ "${OP_Maintainer}/${OP_REPO_NAME}" ]] && return 0 - mkdir -p package/${PKG_DIR} || TIME "Can't create download dir: [package/${PKG_DIR}]" && return 0 + mkdir -p package/${PKG_DIR} || { + TIME "Can't create download dir: [package/${PKG_DIR}]" + return 0 + } [[ -d package/${PKG_DIR}/${PKG_NAME} ]] && { TIME "Removing old package: [${PKG_NAME}] ..." rm -rf package/${PKG_DIR}/${PKG_NAME} @@ -369,7 +369,10 @@ AddPackage() { TIME "Checking out package [${PKG_NAME}] to package/${PKG_DIR} ..." case "${PKG_PROTO}" in git) - + [[ -z ${REPO_BRANCH} ]] && { + TIME "WARNING: Missing ,using default branch: [master]" + REPO_BRANCH=master + } PKG_URL="$(echo ${REPO_URL}/${PKG_NAME} | sed s/[[:space:]]//g)" git clone -b ${REPO_BRANCH} ${PKG_URL} ${PKG_NAME} > /dev/null 2>&1 ;;