xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修复问题

This commit is contained in:
Hyy2001X 2021-07-19 13:18:50 +08:00
parent efbc6405f5
commit 4eac9a1960
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Scripts/AutoBuild_Function.sh
View File

@ -355,13 +355,13 @@ AddPackage() {
PKG_DIR=$2 PKG_DIR=$2
PKG_NAME=$3 PKG_NAME=$3
REPO_URL="https://github.com/$4" REPO_URL="https://github.com/$4"
[[ -z $5 ]] && { REPO_BRANCH=$5
TIME "WARNING: Missing <Branch>,will use default branch: [master]"
REPO_BRANCH=master
} || REPO_BRANCH=$5
[[ ${REPO_URL} =~ "${OP_Maintainer}/${OP_REPO_NAME}" ]] && return 0 [[ ${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} ]] && { [[ -d package/${PKG_DIR}/${PKG_NAME} ]] && {
TIME "Removing old package: [${PKG_NAME}] ..." TIME "Removing old package: [${PKG_NAME}] ..."
rm -rf package/${PKG_DIR}/${PKG_NAME} rm -rf package/${PKG_DIR}/${PKG_NAME}
@ -369,7 +369,10 @@ AddPackage() {
TIME "Checking out package [${PKG_NAME}] to package/${PKG_DIR} ..." TIME "Checking out package [${PKG_NAME}] to package/${PKG_DIR} ..."
case "${PKG_PROTO}" in case "${PKG_PROTO}" in
git) git)
[[ -z ${REPO_BRANCH} ]] && {
TIME "WARNING: Missing <branch> ,using default branch: [master]"
REPO_BRANCH=master
}
PKG_URL="$(echo ${REPO_URL}/${PKG_NAME} | sed s/[[:space:]]//g)" PKG_URL="$(echo ${REPO_URL}/${PKG_NAME} | sed s/[[:space:]]//g)"
git clone -b ${REPO_BRANCH} ${PKG_URL} ${PKG_NAME} > /dev/null 2>&1 git clone -b ${REPO_BRANCH} ${PKG_URL} ${PKG_NAME} > /dev/null 2>&1
;; ;;