suhoan/EasyTier
1
0
Fork 0
mirror of https://mirror.suhoan.cn/https://github.com/EasyTier/EasyTier.git synced 2025-12-14 21:57:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat(easytier-magisk): add support for custom command args. (#1236)

Browse Source
This commit is contained in:
TigerBeanst
2025-08-19 00:04:54 +08:00
committed by GitHub
parent 489661a2ce
commit c37af8c1be
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
easytier-contrib/easytier-magisk/config/command_args_sample Normal file
View File

@@ -0,0 +1 @@
--config-server udp://127.0.0.1:22020/admin --machine-id easytier-magisk

1
easytier-contrib/easytier-magisk/customize.sh
View File

@@ -3,5 +3,6 @@ ui_print '当前架构为' + $ARCH
ui_print '当前系统版本为' + $API ui_print '当前系统版本为' + $API
ui_print '安装目录为: /data/adb/modules/easytier_magisk' ui_print '安装目录为: /data/adb/modules/easytier_magisk'
ui_print '配置文件位置: /data/adb/modules/easytier_magisk/config/config.toml' ui_print '配置文件位置: /data/adb/modules/easytier_magisk/config/config.toml'
ui_print '如果需要自定义启动参数，可将 /data/adb/modules/easytier_magisk/config/command_args_sample 重命名为 command_args，并修改其中内容，使用自定义启动参数时会忽略配置文件'
ui_print '修改后配置文件后在magisk app点击操作按钮即可生效' ui_print '修改后配置文件后在magisk app点击操作按钮即可生效'
ui_print '记得重启' ui_print '记得重启'

7
easytier-contrib/easytier-magisk/easytier_core.sh
View File

@@ -35,9 +35,16 @@ while true; do
continue continue
fi fi
# 如果 config 目录下存在 command_args 文件，则读取其中的内容作为启动参数
if [ -f "${MODDIR}/config/command_args" ]; then
TZ=Asia/Shanghai ${EASYTIER} $(cat ${MODDIR}/config/command_args) > ${LOG_FILE} &
sleep 5s # 等待easytier-core启动完成
update_module_description "已开启(自定义启动参数)(不一定运行成功)"
else
TZ=Asia/Shanghai ${EASYTIER} -c ${CONFIG_FILE} > ${LOG_FILE} & TZ=Asia/Shanghai ${EASYTIER} -c ${CONFIG_FILE} > ${LOG_FILE} &
sleep 5s # 等待easytier-core启动完成 sleep 5s # 等待easytier-core启动完成
update_module_description "已开启(不一定运行成功)" update_module_description "已开启(不一定运行成功)"
fi
ip rule add from all lookup main ip rule add from all lookup main
else else
echo "开关控制$(date "+%Y-%m-%d %H:%M:%S") 进程已存在" echo "开关控制$(date "+%Y-%m-%d %H:%M:%S") 进程已存在"