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

AddPackage 跳过添加相同源码地址的软件包

This commit is contained in:
Hyy2001X 2021-06-27 11:52:06 +08:00
parent 43f048ed59
commit 5a1e4a6bac
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Scripts/AutoBuild_Function.sh
View File

@ -201,12 +201,6 @@ Firmware-Diy_Base() {
if [[ ! ${Default_LAN_IP} == ${Old_IP_Address} ]];then if [[ ! ${Default_LAN_IP} == ${Old_IP_Address} ]];then
TIME "Setting default IP Address to ${Default_LAN_IP} ..." TIME "Setting default IP Address to ${Default_LAN_IP} ..."
sed -i "s/${Old_IP_Address}/${Default_LAN_IP}/g" package/base-files/files/bin/config_generate sed -i "s/${Old_IP_Address}/${Default_LAN_IP}/g" package/base-files/files/bin/config_generate
# a=$(echo ${Old_IP_Address} | egrep -o "[0-9]+.[0-9]+." | awk 'NR==1')
# b=$(echo ${Default_LAN_IP} | egrep -o "[0-9]+.[0-9]+." | awk 'NR==1')
# c="$(egrep -o ")).[0-9]+" package/base-files/files/bin/config_generate)"
# d=")).$(echo ${Default_LAN_IP} | egrep -o "[0-9]+" | awk 'END {print}')"
# sed -i "s/${a}/${b}/g" package/base-files/files/bin/config_generate
# sed -i "s/${c}/${d}/g" package/base-files/files/bin/config_generate
fi fi
else else
TIME "[ERROR] ${Default_LAN_IP} is not an IP Address !" TIME "[ERROR] ${Default_LAN_IP} is not an IP Address !"
@ -385,7 +379,7 @@ AddPackage_List() {
[[ -s $1 ]] && { [[ -s $1 ]] && {
TIME "Loading Custom Packages list: [$1]..." TIME "Loading Custom Packages list: [$1]..."
cat $1 | sed '/^$/d' | while read X;do cat $1 | sed '/^$/d' | while read X;do
[[ -n ${X} && ! $* =~ "#" ]] && AddPackage ${X} [[ -n ${X} && ! $* =~ '#' ]] && AddPackage ${X}
done done
} }
} }
@ -401,6 +395,7 @@ AddPackage() {
PKG_NAME="$3" PKG_NAME="$3"
REPO_URL="https://github.com/$4" REPO_URL="https://github.com/$4"
[[ -z $5 ]] && REPO_BRANCH=master || REPO_BRANCH="$5" [[ -z $5 ]] && REPO_BRANCH=master || REPO_BRANCH="$5"
[[ ${REPO_URL} =~ "${Openwrt_Author}/${Openwrt_Repo_Name}" ]] && return 0
mkdir -p package/${PKG_DIR} mkdir -p package/${PKG_DIR}
[[ -d package/${PKG_DIR}/${PKG_NAME} ]] && { [[ -d package/${PKG_DIR}/${PKG_NAME} ]] && {
@ -418,7 +413,7 @@ AddPackage() {
svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1 svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
;; ;;
esac esac
[[ -f ${PKG_NAME}/Makefile || -f ${PKG_NAME}/README* || -n $(ls -A ${PKG_NAME}) ]] && { [[ -f ${PKG_NAME}/Makefile || -n $(ls -A ${PKG_NAME}) ]] && {
mv -f "${PKG_NAME}" "package/${PKG_DIR}" mv -f "${PKG_NAME}" "package/${PKG_DIR}"
} }
} }