优化代码
This commit is contained in:
Hyy2001X
parent
4e2dd0e8b5
commit
a4db6a227b
|
|
@ -13,7 +13,7 @@ Sysinfo() {
|
|||
printf " 设备信息: ${TARGET_PROFILE}\n"
|
||||
printf " 内核版本: $(uname -rs | cut -d ' ' -f2)\n"
|
||||
printf " 可用内存: %-7s ${Div} %s of %s\n" $(free | grep Mem | awk '{a=$7*100/$2;b=$7/1024;c=$2/1024} {printf("%.1fM %.1f%% %.1fM",b,a,c)}')
|
||||
printf " 可用存储: %-7s ${Div} %s of %s\n" $(df -T / | grep 'overlay' | awk '{a=$5*100/$3;b=$5/1024;c=$3/1024} {printf("%.1fM %.1f%% %.1fM",b,a,c)}')
|
||||
printf " 可用存储: %-7s ${Div} %s of %s\n" $(df -T '/' | grep -v File | awk '{a=$5*100/$3;b=$5/1024;c=$3/1024} {printf("%.1fM %.1f%% %.1fM",b,a,c)}')
|
||||
[ -n "${TEMP}" ] && printf " 设备温度: ${TEMP}°C\n"
|
||||
[ -n "${CoreMark}" ] && printf " 性能得分: ${CoreMark}\n"
|
||||
[ -f /proc/uptime ] && printf " 运行时间: $(awk '{a=$1/86400;b=($1%86400)/3600;c=($1%3600)/60;d=($1%60)} {printf("%d 天 %d 小时 %d 分钟 %d 秒\n",a,b,c,d)}' /proc/uptime)\n"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ Firmware_Diy() {
|
|||
# ${TARGET_BOARD} 设备架构
|
||||
# ${TARGET_FLAG} 固件名称后缀
|
||||
|
||||
# ${Home} OpenWrt 源码位置
|
||||
# ${Home} OpenWrt 源码位置
|
||||
# ${CONFIG_FILE} 使用的配置文件名称
|
||||
# ${FEEDS_CONF} OpenWrt 源码目录下的 feeds.conf.default 文件
|
||||
# ${CustomFiles} 仓库中的 /CustomFiles 绝对路径
|
||||
|
|
@ -43,6 +43,7 @@ Firmware_Diy() {
|
|||
case "${OP_AUTHOR}/${OP_REPO}:${OP_BRANCH}" in
|
||||
coolsnowwolf/lede:master)
|
||||
sed -i "s?/bin/login?/usr/libexec/login.sh?g" ${FEEDS_PKG}/ttyd/files/ttyd.config
|
||||
rm -rf $(PKG_Finder d "package feeds" luci-theme-argon)
|
||||
AddPackage git lean luci-theme-argon jerrykuku 18.06
|
||||
AddPackage git lean luci-app-argon-config jerrykuku master
|
||||
AddPackage git other AutoBuild-Packages Hyy2001X master
|
||||
|
|
@ -55,6 +56,8 @@ Firmware_Diy() {
|
|||
# AddPackage git other OpenAppFilter destan19 master
|
||||
# AddPackage svn other luci-app-ddnsto linkease/nas-packages/trunk/luci
|
||||
# AddPackage svn other ddnsto linkease/nas-packages/trunk/network/services
|
||||
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
|
||||
# patch < ${CustomFiles}/Patches/revert_remove-alterId-config.patch -p1 -d ${Home}
|
||||
patch < ${CustomFiles}/Patches/fix_ntfs3_antfs_conflict.patch -p1 -d ${Home}
|
||||
patch < ${CustomFiles}/Patches/fix_aria2_autocreate_path.patch -p1 -d ${Home}
|
||||
|
|
@ -66,7 +69,7 @@ Firmware_Diy() {
|
|||
sed -i "/DEVICE_COMPAT_VERSION := 1.1/d" target/linux/ramips/image/mt7621.mk
|
||||
;;
|
||||
x86_64)
|
||||
AddPackage git other openwrt-passwall xiaorouji main
|
||||
# AddPackage git other openwrt-passwall xiaorouji main
|
||||
rm -rf packages/lean/autocore
|
||||
AddPackage git lean autocore-modify Hyy2001X master
|
||||
;;
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue