From 673b5d9c35ad8f17337b2df268594e3551298bff Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Thu, 15 Apr 2021 17:58:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20PKG=5FFinder?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/AutoBuild_Function.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index 0eb7379..8ae3f22 100755 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -291,7 +291,7 @@ PKG_Finder() { _PKG_DIR=${2} _PKG_NAME=${3} [[ -z ${_PKG_TYPE} ]] && [[ -z ${_PKG_NAME} ]] || [[ -z ${_PKG_DIR} ]] && return - PKG_RESULT=$(find -name ${_PKG_DIR}/${_PKG_NAME} -type ${_PKG_TYPE} -exec echo {} \;) + _PKG_RESULT=$(find ${_PKG_DIR} -name ${_PKG_NAME} -type ${_PKG_TYPE} -exec echo {} \;) [[ -n "${_PKG_RESULT}" ]] && echo "${_PKG_RESULT}" unset _PKG_TYPE _PKG_DIR _PKG_NAME } @@ -308,13 +308,7 @@ Auto_ExtraPackages() { TIME "Loading Custom Packages list: [${TARGET_PROFILE}] ..." cat ${TARGET_FILE} | while read X do - [[ -n "${X}" ]] && { - if [[ ! "${X}" =~ "#" ]];then - ExtraPackages ${X} - else - TIME "Skip line: ${X}" - fi - } + [[ -n "${X}" ]] && ExtraPackages ${X} unset X done TIME "[CustomPackages] All done !" @@ -345,9 +339,6 @@ ExtraPackages() { svn) svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1 ;; - *) - TIME "[ERROR] Error option: ${PKG_PROTO} !" && return - ;; esac if [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ];then TIME "Package [${PKG_NAME}] is detected!"