From 574174588da7dd8345ac2bfe64b1a74840895b6b Mon Sep 17 00:00:00 2001
From: wnlen <62139570+wnlen@users.noreply.github.com>
Date: Tue, 17 Mar 2026 14:44:55 +0800
Subject: [PATCH] Revert "Merge branch 'dev' of
 https://github.com/wnlen/clash-for-linux into dev"

This reverts commit b622449014bc86683ec0374eaf00bcd653f8a506, reversing
changes made to 6d55e006224221344e6437206c8312a28bd44653.
---
 start.sh | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/start.sh b/start.sh
index 26bdb84..984ddee 100644
--- a/start.sh
+++ b/start.sh
@@ -345,32 +345,6 @@ if_success() {
   fi
 }
 
-normalize_config_from_env() {
-  local f="$1"
-  [ -f "$f" ] || return 0
-
-  # 端口：你当前诉求是 mixed-port 统一
-  if [ -n "${CLASH_HTTP_PORT:-}" ]; then
-    upsert_yaml_kv "$f" "mixed-port" "${CLASH_HTTP_PORT}" || true
-  fi
-
-  # 可选：如果你也支持 socks/redir，就一起
-  if [ -n "${CLASH_SOCKS_PORT:-}" ]; then
-    upsert_yaml_kv "$f" "socks-port" "${CLASH_SOCKS_PORT}" || true
-  fi
-  if [ -n "${CLASH_REDIR_PORT:-}" ]; then
-    upsert_yaml_kv "$f" "redir-port" "${CLASH_REDIR_PORT}" || true
-  fi
-
-  # 可选：allow-lan / bind-address
-  if [ -n "${CLASH_ALLOW_LAN:-}" ]; then
-    upsert_yaml_kv "$f" "allow-lan" "${CLASH_ALLOW_LAN}" || true
-  fi
-  if [ -n "${CLASH_LISTEN_IP:-}" ]; then
-    upsert_yaml_kv "$f" "bind-address" "${CLASH_LISTEN_IP}" || true
-  fi
-}
-
 ensure_subconverter() {
   local bin="${Server_Dir}/tools/subconverter/subconverter"
   local port="25500"
@@ -717,10 +691,6 @@ if [ -s "$Temp_Dir/clash.yaml" ] && grep -qE '^(proxies:|proxy-providers:|mixed-
   force_write_controller_and_ui "$Conf_Dir/config.yaml" || true
   force_write_secret "$Conf_Dir/config.yaml" || true
 
-  # 用 .env 覆盖订阅里的端口
-  normalize_config_from_env "$Temp_Dir/config.yaml"
-  normalize_config_from_env "$Conf_Dir/config.yaml"
-
   # 创建 UI 软链（systemd non-root 用 /tmp）
   Dashboard_Src="$Server_Dir/dashboard/public"
   if [ -d "$Dashboard_Src" ]; then