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-05-18 10:10:29 +08:00
parent 41e1432820
commit 88c6c6f010
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Scripts/AutoBuild_Function.sh
View File

@ -105,24 +105,24 @@ Firmware-Diy_Base() {
Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin Replace_File Scripts/AutoBuild_Tools.sh package/base-files/files/bin
} }
[[ "${INCLUDE_AutoUpdate}" == true ]] && { [[ "${INCLUDE_AutoUpdate}" == true ]] && {
AddPackage git lean luci-app-autoupdate https://github.com/Hyy2001X main AddPackage git lean luci-app-autoupdate Hyy2001X main
Replace_File Scripts/AutoUpdate.sh package/base-files/files/bin Replace_File Scripts/AutoUpdate.sh package/base-files/files/bin
} }
[[ "${INCLUDE_Theme_Argon}" == true ]] && { [[ "${INCLUDE_Theme_Argon}" == true ]] && {
case ${Openwrt_Author} in case ${Openwrt_Author} in
coolsnowwolf) coolsnowwolf)
AddPackage git lean luci-theme-argon https://github.com/jerrykuku 18.06 AddPackage git lean luci-theme-argon jerrykuku 18.06
;; ;;
*) *)
case ${Current_Branch} in case ${Current_Branch} in
19.07) 19.07)
AddPackage git other luci-theme-argon https://github.com/jerrykuku v2.2.5 AddPackage git other luci-theme-argon jerrykuku v2.2.5
;; ;;
21.02) 21.02)
AddPackage git other luci-theme-argon https://github.com/jerrykuku AddPackage git other luci-theme-argon jerrykuku master
;; ;;
18.06) 18.06)
AddPackage git other luci-theme-argon https://github.com/jerrykuku 18.06 AddPackage git other luci-theme-argon jerrykuku 18.06
;; ;;
*) *)
TIME "[ERROR] Unknown Openwrt branch: [${Current_Branch}] !" TIME "[ERROR] Unknown Openwrt branch: [${Current_Branch}] !"
@ -164,14 +164,13 @@ Firmware-Diy_Base() {
coolsnowwolf) coolsnowwolf)
Replace_File CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh Replace_File CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh
Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
AddPackage git other helloworld https://github.com/fw876 master AddPackage git other helloworld fw876 master
sed -i 's/143/143,8080/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr sed -i 's/143/143,8080/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr
sed -i "s?iptables?#iptables?g" ${Version_File} sed -i "s?iptables?#iptables?g" ${Version_File}
sed -i "s?${Old_Version}?${Old_Version} Compiled by ${Author} [${Display_Date}]?g" ${Version_File} sed -i "s?${Old_Version}?${Old_Version} Compiled by ${Author} [${Display_Date}]?g" ${Version_File}
[[ "${INCLUDE_DRM_I915}" == true ]] && Replace_File CustomFiles/Depends/i915-5.4 target/linux/x86 config-5.4 [[ "${INCLUDE_DRM_I915}" == true ]] && Replace_File CustomFiles/Depends/i915-5.4 target/linux/x86 config-5.4
;; ;;
immortalwrt) immortalwrt)
sed -i 's/143/143,8080/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr
Replace_File CustomFiles/Depends/coremark_ImmortalWrt.sh package/base-files/files/etc coremark.sh Replace_File CustomFiles/Depends/coremark_ImmortalWrt.sh package/base-files/files/etc coremark.sh
Replace_File CustomFiles/Depends/ImmortalWrt package/base-files/files/etc openwrt_release Replace_File CustomFiles/Depends/ImmortalWrt package/base-files/files/etc openwrt_release
Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
@ -198,7 +197,7 @@ Firmware-Diy_Base() {
19.07 | 21.02) 19.07 | 21.02)
Replace_File CustomFiles/Patches/0003-upx-ucl-${Current_Branch}.patch ./ Replace_File CustomFiles/Patches/0003-upx-ucl-${Current_Branch}.patch ./
cat 0003-upx-ucl-${Current_Branch}.patch | patch -p1 > /dev/null 2>&1 cat 0003-upx-ucl-${Current_Branch}.patch | patch -p1 > /dev/null 2>&1
AddPackage svn ../feeds/packages/lang golang https://github.com/coolsnowwolf/packages/trunk/lang AddPackage svn ../feeds/packages/lang golang coolsnowwolf/packages/trunk/lang
TIME "Start to convert zh-cn translation files to zh_Hans ..." TIME "Start to convert zh-cn translation files to zh_Hans ..."
Replace_File Scripts/Convert_Translation.sh package Replace_File Scripts/Convert_Translation.sh package
cd ./package cd ./package
@ -365,7 +364,7 @@ AddPackage() {
PKG_PROTO=${1} PKG_PROTO=${1}
PKG_DIR=${2} PKG_DIR=${2}
PKG_NAME=${3} PKG_NAME=${3}
REPO_URL=${4} REPO_URL="https://github.com/${4}"
REPO_BRANCH=${5} REPO_BRANCH=${5}
;; ;;
*) *)