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

修复 PKG_Finder

This commit is contained in:
Hyy2001X 2021-04-15 17:58:04 +08:00
parent 908de13d20
commit 673b5d9c35
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Scripts/AutoBuild_Function.sh
View File

@ -291,7 +291,7 @@ PKG_Finder() {
_PKG_DIR=${2} _PKG_DIR=${2}
_PKG_NAME=${3} _PKG_NAME=${3}
[[ -z ${_PKG_TYPE} ]] && [[ -z ${_PKG_NAME} ]] || [[ -z ${_PKG_DIR} ]] && return [[ -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}" [[ -n "${_PKG_RESULT}" ]] && echo "${_PKG_RESULT}"
unset _PKG_TYPE _PKG_DIR _PKG_NAME unset _PKG_TYPE _PKG_DIR _PKG_NAME
} }
@ -308,13 +308,7 @@ Auto_ExtraPackages() {
TIME "Loading Custom Packages list: [${TARGET_PROFILE}] ..." TIME "Loading Custom Packages list: [${TARGET_PROFILE}] ..."
cat ${TARGET_FILE} | while read X cat ${TARGET_FILE} | while read X
do do
[[ -n "${X}" ]] && { [[ -n "${X}" ]] && ExtraPackages ${X}
if [[ ! "${X}" =~ "#" ]];then
ExtraPackages ${X}
else
TIME "Skip line: ${X}"
fi
}
unset X unset X
done done
TIME "[CustomPackages] All done !" TIME "[CustomPackages] All done !"
@ -345,9 +339,6 @@ ExtraPackages() {
svn) svn)
svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1 svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
;; ;;
*)
TIME "[ERROR] Error option: ${PKG_PROTO} !" && return
;;
esac esac
if [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ];then if [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ];then
TIME "Package [${PKG_NAME}] is detected!" TIME "Package [${PKG_NAME}] is detected!"