From c37af8c1becdb70022d1337c244ee1ed687d830e Mon Sep 17 00:00:00 2001
From: TigerBeanst <3889846+TigerBeanst@users.noreply.github.com>
Date: Tue, 19 Aug 2025 00:04:54 +0800
Subject: [PATCH] feat(easytier-magisk): add support for custom command args.
 (#1236)

---
 .../easytier-magisk/config/command_args_sample      |  1 +
 easytier-contrib/easytier-magisk/customize.sh       |  1 +
 easytier-contrib/easytier-magisk/easytier_core.sh   | 13 ++++++++++---
 3 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 easytier-contrib/easytier-magisk/config/command_args_sample

diff --git a/easytier-contrib/easytier-magisk/config/command_args_sample b/easytier-contrib/easytier-magisk/config/command_args_sample
new file mode 100644
index 00000000..9b61aaee
--- /dev/null
+++ b/easytier-contrib/easytier-magisk/config/command_args_sample
@@ -0,0 +1 @@
+--config-server udp://127.0.0.1:22020/admin --machine-id easytier-magisk
\ No newline at end of file
diff --git a/easytier-contrib/easytier-magisk/customize.sh b/easytier-contrib/easytier-magisk/customize.sh
index 6c7393a7..986d4190 100644
--- a/easytier-contrib/easytier-magisk/customize.sh
+++ b/easytier-contrib/easytier-magisk/customize.sh
@@ -3,5 +3,6 @@ ui_print '当前架构为' + $ARCH
 ui_print '当前系统版本为' + $API
 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/command_args_sample 重命名为 command_args，并修改其中内容，使用自定义启动参数时会忽略配置文件'
 ui_print '修改后配置文件后在magisk app点击操作按钮即可生效'
 ui_print '记得重启'
\ No newline at end of file
diff --git a/easytier-contrib/easytier-magisk/easytier_core.sh b/easytier-contrib/easytier-magisk/easytier_core.sh
index 7ff8de2a..8949f4fa 100644
--- a/easytier-contrib/easytier-magisk/easytier_core.sh
+++ b/easytier-contrib/easytier-magisk/easytier_core.sh
@@ -35,9 +35,16 @@ while true; do
                 continue
             fi
 
-            TZ=Asia/Shanghai ${EASYTIER} -c ${CONFIG_FILE} > ${LOG_FILE} &
-            sleep 5s # 等待easytier-core启动完成
-            update_module_description "已开启(不一定运行成功)"
+            # 如果 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} &
+                sleep 5s # 等待easytier-core启动完成
+                update_module_description "已开启(不一定运行成功)"
+            fi
             ip rule add from all lookup main
         else
             echo "开关控制$(date "+%Y-%m-%d %H:%M:%S") 进程已存在"