From c35921839506ba782a42e56f973f0177643d74a7 Mon Sep 17 00:00:00 2001
From: fscarmen <62703343+fscarmen@users.noreply.github.com>
Date: Mon, 19 Feb 2024 17:31:35 +0000
Subject: [PATCH] Fix a bug in adding protocol's node name.

---
 README.md   | 2 +-
 sing-box.sh | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6c364ee..98f9e78 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ bash <(wget -qO- https://raw.githubusercontent.com/fscarmen/sing-box/main/sing-b
 
 ## 鸣谢下列作者的文章和项目:
 千歌 sing-box 模板: https://github.com/chika0801/sing-box-examples   
-瞎折腾 sing-box 模板: https://t.me/ztvps/37
+瞎折腾 sing-box 模板: https://t.me/ztvps/67
 
 
 ## 免责声明:
diff --git a/sing-box.sh b/sing-box.sh
index 91b798a..fa97d96 100644
--- a/sing-box.sh
+++ b/sing-box.sh
@@ -1492,7 +1492,7 @@ $(hint "ss://$(echo -n "$SHADOWSOCKS_METHOD:${UUID[15]}" | base64 -w0)@${SERVER_
 EOF
   [ -n "$PORT_TROJAN" ] && cat >> $WORK_DIR/list << EOF
 ----------------------------
-$(hint "trojan://$TROJAN_PASSWORD@${SERVER_IP_1}:$PORT_TROJAN?security=tls&allowInsecure=1&fp=random&type=tcp#${NODE_NAME} ${NODE_TAG[5]}")
+$(hint "trojan://$TROJAN_PASSWORD@${SERVER_IP_1}:$PORT_TROJAN?security=tls&allowInsecure=1&fp=random&type=tcp#${NODE_NAME[16]} ${NODE_TAG[5]}")
 EOF
   [ -n "$PORT_VMESS_WS" ] && WS_SERVER_IP=${WS_SERVER_IP[17]} && TYPE_HOST_DOMAIN=$VMESS_HOST_DOMAIN && TYPE_PORT_WS=$PORT_VMESS_WS && cat >> $WORK_DIR/list << EOF
 ----------------------------
@@ -1907,7 +1907,9 @@ change_protocols() {
 
   # 用于新节点的配置信息
   UUID=$(awk '{print $1}' <<< "${UUID[@]} $TROJAN_PASSWORD")
-  NODE_NAME=$(awk '{print $1}' <<< "${NODE_NAME[@]}")
+  for v in "${NODE_NAME[@]}"; do
+    [ -n "$v" ] && NODE_NAME="$v" && break
+  done
   [ "${#WS_SERVER_IP[@]}" -gt 0 ] && WS_SERVER_IP=$(awk '{print $1}' <<< "${WS_SERVER_IP[@]}") && CDN=$(awk '{print $1}' <<< "${CDN[@]}")
 
   # 寻找待删除协议的 inbound 文件名