xinb/X-OpenWrt
1
0
Fork 0
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git synced 2026-09-18 08:20:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化代码

Browse Source
This commit is contained in:
Hyy2001X
2022-03-15 11:46:54 +08:00
parent 4e2dd0e8b5
commit a4db6a227b
3 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Scripts/AutoBuild_Function.sh
+7 -13
View File
@@ -3,9 +3,6 @@
# AutoBuild Functions
Firmware_Diy_Before() {
BASE_FILES=${GITHUB_WORKSPACE}/openwrt/package/base-files/files
ECHO "[Firmware_Diy_Before] Starting ..."
Home="${GITHUB_WORKSPACE}/openwrt"
CONFIG_TEMP="${GITHUB_WORKSPACE}/openwrt/.config"
@@ -26,12 +23,12 @@ BASE_FILES=${GITHUB_WORKSPACE}/openwrt/package/base-files/files
fi
case "${OP_AUTHOR}/${OP_REPO}" in
coolsnowwolf/lede)
Version_File="package/lean/default-settings/files/zzz-default-settings"
Version_File=package/lean/default-settings/files/zzz-default-settings
zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})"
OP_VERSION="${zzz_Default_Version}-${Compile_Date}"
;;
immortalwrt/immortalwrt)
Version_File=${BASE_FILES}/etc/openwrt_release
Version_File=package/base-files/files/etc/openwrt_release
OP_VERSION="${OP_VERSION_HEAD}${Compile_Date}"
;;
*)
@@ -58,12 +55,12 @@ BASE_FILES=${GITHUB_WORKSPACE}/openwrt/package/base-files/files
Firmware_Format=bin
;;
rockchip | x86 | bcm27xx | mxs | sunxi | zynq)
Firmware_Format=$(if_IMG)
Firmware_Format="$(if_IMG)"
;;
mvebu)
case "${TARGET_SUBTARGET}" in
cortexa53 | cortexa72)
Firmware_Format=$(if_IMG)
Firmware_Format="$(if_IMG)"
;;
esac
;;
@@ -72,7 +69,7 @@ BASE_FILES=${GITHUB_WORKSPACE}/openwrt/package/base-files/files
;;
esac
}
[[ ${Author_URL} != false && ${Author_URL} == AUTO ]] && Author_URL=${Github}
[[ ${Author_URL} != false && ${Author_URL} == AUTO ]] && Author_URL="${Github}"
[[ ${Author_URL} == false ]] && unset Author_URL
if [[ ${Default_FLAG} == AUTO ]]
then
@@ -105,6 +102,7 @@ Checkout_Virtual_Images=${Checkout_Virtual_Images}
AutoBuild_Firmware=${AutoBuild_Firmware}
CustomFiles=${GITHUB_WORKSPACE}/CustomFiles
Scripts=${GITHUB_WORKSPACE}/Scripts
BASE_FILES=${GITHUB_WORKSPACE}/openwrt/package/base-files/files
FEEDS_LUCI=${GITHUB_WORKSPACE}/openwrt/package/feeds/luci
FEEDS_PKG=${GITHUB_WORKSPACE}/openwrt/package/feeds/packages
Banner_Message="${Banner_Message}"
@@ -124,8 +122,7 @@ EOF
Firmware_Diy_Main() {
ECHO "[Firmware_Diy_Main] Starting ..."
CD ${Home}
chmod +x -R ${Scripts}
chmod 777 -R ${CustomFiles}
chmod 777 -R ${Scripts} ${CustomFiles}
if [[ ${INCLUDE_AutoBuild_Features} == true ]]
then
MKDIR ${BASE_FILES}/etc/AutoBuild
@@ -204,9 +201,6 @@ EOF
else
sed -i "s?${zzz_Default_Version}?${zzz_Default_Version} @ ${Author} [${Display_Date}]?g" ${Version_File}
fi
ECHO "Downloading [ShadowSocksR Plus+] for coolsnowwolf/lede ..."
AddPackage git other helloworld fw876 master
sed -i 's/143/143,8080,8443/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr
;;
immortalwrt/immortalwrt)
Copy ${CustomFiles}/Depends/openwrt_release_${OP_AUTHOR} ${BASE_FILES}/etc openwrt_release