diff --git a/README.md b/README.md index 2eceb315ef..046fcb3016 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ ## 固件特色 [![](https://img.shields.io/badge/-本项目固件特色-FFFFFF.svg)](#固件特色-) 1. 固件每天定时自动编译,以确保获得最新体验 -2. 集成绝大多数有线、无线、3G / 4G 网卡驱动 +2. 集成部分常用有线、无线、3G / 4G 网卡驱动 3. 集成中文版 netdata 实时监控插件,小白也能轻松看懂系统概况 4. 集成 iStore 应用商店,可根据自己需求自由安装所需插件 5. 集成 Docker 服务,可在 OpenWrt 内自由部署 Docker 应用 @@ -75,8 +75,8 @@  ├── 内核日志
 ├── 系统进程
 ├── 实时信息
- ├── 在线用户
 ├── 实时监控
+ ├── 在线用户
 ├── WireGuard 状态
 ├── 负载均衡
 └── 释放内存 @@ -105,11 +105,9 @@  ├── PassWall2
 ├── Hello World
 ├── iKoolProxy 滤广告
- ├── Bypass
 ├── 广告屏蔽大师 Plus+
 ├── AdGuard Home
 ├── ShadowSocksR Plus+
- ├── DDNSTO 远程控制
 ├── 应用过滤
 ├── 微信推送
 ├── 上网时间控制
@@ -148,10 +146,10 @@  ├── 可道云
 ├── NFS 管理
 ├── 微力同步
+ ├── Alist 文件列表
 ├── qBittorrent
 ├── USB 打印服务器
 ├── 硬盘休眠
- ├── aMule设置
 ├── 挂载 SMB 网络共享
 ├── 网络共享
 ├── FTP 服务器
@@ -192,7 +190,7 @@  ├── 配置
 ├── 备份
 ├── 网速监控
- └── 流量监控 + └── 实时流量监测  └── 退出 diff --git a/diy-mini.sh b/diy-mini.sh index b883910450..c2783524a4 100644 --- a/diy-mini.sh +++ b/diy-mini.sh @@ -72,6 +72,7 @@ svn export https://github.com/linkease/istore/trunk/luci package/luci-app-store svn export https://github.com/haiibo/packages/trunk/luci-app-onliner package/luci-app-onliner sed -i '/bin\/sh/a\uci set nlbwmon.@nlbwmon[0].refresh_interval=2s' package/lean/default-settings/files/zzz-default-settings sed -i '/nlbwmon/a\uci commit nlbwmon' package/lean/default-settings/files/zzz-default-settings +chmod 755 package/luci-app-onliner/root/usr/share/onliner/setnlbw.sh # x86 型号只显示 CPU 型号 sed -i 's/${g}.*/${a}${b}${c}${d}${e}${f}${hydrid}/g' package/lean/autocore/files/x86/autocore @@ -84,25 +85,27 @@ date_version=$(date +"%y.%m.%d") orig_version=$(cat "package/lean/default-settings/files/zzz-default-settings" | grep DISTRIB_REVISION= | awk -F "'" '{print $2}') sed -i "s/${orig_version}/R${date_version} by Haiibo/g" package/lean/default-settings/files/zzz-default-settings +# 修复 hostapd 报错 +sed -i '/TARGET_LDFLAGS += -lubox -lubus/i\TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto' package/network/services/hostapd/Makefile +sed -i '/TARGET_LDFLAGS += -lubox -lubus/i\TARGET_LDFLAGS += -Wl,--gc-sections -flto=jobserver -fuse-linker-plugin' package/network/services/hostapd/Makefile + # 修改 Makefile -find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/include\ \.\.\/\.\.\/luci\.mk/include \$(TOPDIR)\/feeds\/luci\/luci\.mk/g' {} -find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/include\ \.\.\/\.\.\/lang\/golang\/golang\-package\.mk/include \$(TOPDIR)\/feeds\/packages\/lang\/golang\/golang\-package\.mk/g' {} -find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/PKG_SOURCE_URL:=\@GHREPO/PKG_SOURCE_URL:=https:\/\/github\.com/g' {} -find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/PKG_SOURCE_URL:=\@GHCODELOAD/PKG_SOURCE_URL:=https:\/\/codeload\.github\.com/g' {} +find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/..\/..\/luci.mk/$(TOPDIR)\/feeds\/luci\/luci.mk/g' {} +find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/..\/..\/lang\/golang\/golang-package.mk/$(TOPDIR)\/feeds\/packages\/lang\/golang\/golang-package.mk/g' {} +find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/PKG_SOURCE_URL:=@GHREPO/PKG_SOURCE_URL:=https:\/\/github.com/g' {} +find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/PKG_SOURCE_URL:=@GHCODELOAD/PKG_SOURCE_URL:=https:\/\/codeload.github.com/g' {} # 取消主题默认设置 find package/luci-theme-*/* -type f -name '*luci-theme-*' -print -exec sed -i '/set luci.main.mediaurlbase/d' {} \; # 调整 Docker 到 服务 菜单 sed -i 's/"admin"/"admin", "services"/g' package/luci-app-dockerman/luasrc/controller/*.lua -sed -i 's/"admin/"admin\/services/g' package/luci-app-dockerman/luasrc/model/*.lua -sed -i 's/"admin/"admin\/services/g' package/luci-app-dockerman/luasrc/model/cbi/dockerman/*.lua -sed -i 's/"admin/"admin\/services/g' package/luci-app-dockerman/luasrc/view/dockerman/*.htm -sed -i 's/"admin/"admin\/services/g' package/luci-app-dockerman/luasrc/view/dockerman/cbi/*.htm +sed -i 's/"admin"/"admin", "services"/g; s/admin\//admin\/services\//g' package/luci-app-dockerman/luasrc/model/cbi/dockerman/*.lua +sed -i 's/admin\//admin\/services\//g' package/luci-app-dockerman/luasrc/view/dockerman/*.htm +sed -i 's|admin\\|admin\\/services\\|g' package/luci-app-dockerman/luasrc/view/dockerman/container.htm # 调整 ZeroTier 到 服务 菜单 -# sed -i '/"VPN"/d' feeds/luci/applications/luci-app-zerotier/luasrc/controller/zerotier.lua -# sed -i 's/vpn/services/g' feeds/luci/applications/luci-app-zerotier/luasrc/controller/zerotier.lua +# sed -i 's/vpn/services/g; s/VPN/Services/g' feeds/luci/applications/luci-app-zerotier/luasrc/controller/zerotier.lua # sed -i 's/vpn/services/g' feeds/luci/applications/luci-app-zerotier/luasrc/view/zerotier/zerotier_status.htm # 取消对 samba4 的菜单调整 diff --git a/diy-script.sh b/diy-script.sh index 22fc6c4c6f..5eca5de344 100644 --- a/diy-script.sh +++ b/diy-script.sh @@ -86,6 +86,7 @@ svn export https://github.com/linkease/istore/trunk/luci package/luci-app-store svn export https://github.com/haiibo/packages/trunk/luci-app-onliner package/luci-app-onliner sed -i '/bin\/sh/a\uci set nlbwmon.@nlbwmon[0].refresh_interval=2s' package/lean/default-settings/files/zzz-default-settings sed -i '/nlbwmon/a\uci commit nlbwmon' package/lean/default-settings/files/zzz-default-settings +chmod 755 package/luci-app-onliner/root/usr/share/onliner/setnlbw.sh # x86 型号只显示 CPU 型号 sed -i 's/${g}.*/${a}${b}${c}${d}${e}${f}${hydrid}/g' package/lean/autocore/files/x86/autocore @@ -98,11 +99,15 @@ date_version=$(date +"%y.%m.%d") orig_version=$(cat "package/lean/default-settings/files/zzz-default-settings" | grep DISTRIB_REVISION= | awk -F "'" '{print $2}') sed -i "s/${orig_version}/R${date_version} by Haiibo/g" package/lean/default-settings/files/zzz-default-settings +# 修复 hostapd 报错 +sed -i '/TARGET_LDFLAGS += -lubox -lubus/i\TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto' package/network/services/hostapd/Makefile +sed -i '/TARGET_LDFLAGS += -lubox -lubus/i\TARGET_LDFLAGS += -Wl,--gc-sections -flto=jobserver -fuse-linker-plugin' package/network/services/hostapd/Makefile + # 修改 Makefile -find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/include\ \.\.\/\.\.\/luci\.mk/include \$(TOPDIR)\/feeds\/luci\/luci\.mk/g' {} -find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/include\ \.\.\/\.\.\/lang\/golang\/golang\-package\.mk/include \$(TOPDIR)\/feeds\/packages\/lang\/golang\/golang\-package\.mk/g' {} -find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/PKG_SOURCE_URL:=\@GHREPO/PKG_SOURCE_URL:=https:\/\/github\.com/g' {} -find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/PKG_SOURCE_URL:=\@GHCODELOAD/PKG_SOURCE_URL:=https:\/\/codeload\.github\.com/g' {} +find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/..\/..\/luci.mk/$(TOPDIR)\/feeds\/luci\/luci.mk/g' {} +find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/..\/..\/lang\/golang\/golang-package.mk/$(TOPDIR)\/feeds\/packages\/lang\/golang\/golang-package.mk/g' {} +find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/PKG_SOURCE_URL:=@GHREPO/PKG_SOURCE_URL:=https:\/\/github.com/g' {} +find package/*/ -maxdepth 2 -path "*/Makefile" | xargs -i sed -i 's/PKG_SOURCE_URL:=@GHCODELOAD/PKG_SOURCE_URL:=https:\/\/codeload.github.com/g' {} # 取消主题默认设置 find package/luci-theme-*/* -type f -name '*luci-theme-*' -print -exec sed -i '/set luci.main.mediaurlbase/d' {} \;