From 5a5b688ad51b6b8c4d223ee7962dd77de9b567fb Mon Sep 17 00:00:00 2001 From: sofia <253282481+sofia-riese@users.noreply.github.com> Date: Sun, 25 Jan 2026 12:42:01 +0800 Subject: [PATCH] feat: redesign static text menu --- scripts/menus/6_core_config.sh | 4 +- scripts/menus/common.sh | 13 ++- scripts/menus/fw_filter.sh | 178 +++++++++++++++++---------------- scripts/menus/uninstall.sh | 6 +- 4 files changed, 111 insertions(+), 90 deletions(-) diff --git a/scripts/menus/6_core_config.sh b/scripts/menus/6_core_config.sh index 6889c3d3..7e224634 100644 --- a/scripts/menus/6_core_config.sh +++ b/scripts/menus/6_core_config.sh @@ -16,7 +16,7 @@ URI_EXP='ss|vmess|vless|trojan|tuic|anytls|shadowtls|hysteria(2)?' # 配置文件主界面 set_core_config() { while true; do - format_box "\033[30;47m配置文件管理\033[0m" + comp_box "\033[30;47m配置文件管理\033[0m" [ -s "$CRASHDIR"/configs/providers.cfg ] || [ -s "$CRASHDIR"/configs/providers_uri.cfg ] && { echo -e "\033[36m输入数字可管理对应提供者\033[0m" cat "$CRASHDIR"/configs/providers.cfg "$CRASHDIR"/configs/providers_uri.cfg 2>/dev/null | @@ -114,7 +114,7 @@ setproviders() { [ -z "$ua" ] && ua='clash.meta' while true; do link_info=$(echo "$link$link_uri" | cut -c 1-30) - format_box "\033[36m支持添加订阅链接/分享链接/本地文件作为提供者\033[0m" + comp_box "\033[36m支持添加订阅链接/分享链接/本地文件作为提供者\033[0m" content_line "1) 设置\033[36m名称或代号\033[0m \033[32m$name\033[0m" content_line "2) 设置\033[32m链接或路径\033[0m： \033[36m$link_info...\033[0m" [ -n "$link" ] && { diff --git a/scripts/menus/common.sh b/scripts/menus/common.sh index 111bf38e..c457af12 100644 --- a/scripts/menus/common.sh +++ b/scripts/menus/common.sh @@ -16,7 +16,8 @@ msg_alert() { sleep "$_sleep_time" } -format_box() { +# complete box +comp_box() { line_break separator_line "=" for line in "$@"; do @@ -25,6 +26,16 @@ format_box() { separator_line "=" } +# bottom box +btm_box() { + for line in "$@"; do + content_line "$line" + done + separator_line "=" +} + +# ================================================= + common_back() { content_line "0) $COMMON_BACK" separator_line "=" diff --git a/scripts/menus/fw_filter.sh b/scripts/menus/fw_filter.sh index 3a5d3814..8f966915 100644 --- a/scripts/menus/fw_filter.sh +++ b/scripts/menus/fw_filter.sh @@ -20,6 +20,7 @@ set_fw_filter() { content_line "4) 过滤CN_IP(4/6)列表：\033[36m$cn_ip_route\033[0m ———优化性能" content_line "5) 自定义透明路由ipv4网段：适合vlan等复杂网络环境" content_line "6) 自定义保留地址ipv4网段：需要以保留地址为访问目标的环境" + content_line "" common_back read -r -p "$COMMON_INPUT> " num case "$num" in @@ -28,7 +29,7 @@ set_fw_filter() { ;; 1) if [ -n "$(pidof CrashCore)" ] && [ "$firewall_mod" = 'iptables' ]; then - format_box "切换时将停止服务，是否继续：" + comp_box "切换时将停止服务，是否继续：" content_line "1) 是" content_line "0) 否，返回上级菜单" separator_line "=" @@ -50,56 +51,59 @@ set_fw_filter() { if echo "$redir_mod" | grep -oqE '混合|Tproxy|Tun'; then if [ "$quic_rj" = "OFF" ]; then quic_rj=ON - msg_alert "\033[33m已禁止QUIC流量通过ShellCrash内核！！\033[0m" + msg_alert "\033[33m已禁止QUIC流量通过ShellCrash内核！\033[0m" else quic_rj=OFF - msg_alert "\033[33m已取消禁止QUIC协议流量！！\033[0m" + msg_alert "\033[33m已取消禁止QUIC协议流量！\033[0m" fi setconfig quic_rj $quic_rj else - msg_alert "\033[33m当前模式默认不会代理UDP流量，无需设置！！\033[0m" + msg_alert "\033[33m当前模式默认不会代理UDP流量，无需设置！\033[0m" fi ;; 4) if [ -n "$(ipset -v 2>/dev/null)" ] || [ "$firewall_mod" = 'nftables' ]; then if [ "$cn_ip_route" = "OFF" ]; then cn_ip_route=ON - msg_alert -t 2 "\033[32m已开启CN_IP绕过内核功能！！\033[0m" \ - "\033[31m注意！！！此功能会导致全局模式及一切CN相关规则失效！！！\033[0m" + msg_alert -t 2 "\033[32m已开启CN_IP绕过内核功能！\033[0m" \ + "\033[31m注意：此功能会导致全局模式及一切CN相关规则失效！\033[0m" else cn_ip_route=OFF - msg_alert "\033[33m已禁用CN_IP绕过内核功能！！\033[0m" + msg_alert "\033[33m已禁用CN_IP绕过内核功能！\033[0m" fi setconfig cn_ip_route $cn_ip_route else - msg_alert "\033[31m当前设备缺少ipset模块或未使用nftables模式，无法启用绕过功能！！\033[0m" + msg_alert "\033[31m当前设备缺少ipset模块或未使用nftables模式，无法启用绕过功能！\033[0m" fi ;; 5) set_cust_host_ipv4 ;; 6) - [ -z "$reserve_ipv4" ] && reserve_ipv4="0.0.0.0/8 10.0.0.0/8 127.0.0.0/8 100.64.0.0/10 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16 224.0.0.0/4 240.0.0.0/4" - format_box "\033[33m地址必须是空格分隔，错误的设置可能导致网络回环或启动报错，请务必谨慎！\033[0m" \ - "当前网段：\033[36m$reserve_ipv4\033[0m" \ - "" \ - "请直接输入自定义保留地址ipv4网段" \ - "或输入 0 返回上级菜单" - read -r -p "请输入> " text - if [ "$text" = 0 ]; then - continue - elif - echo "$text" | grep -Eq "(((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])/(3[0-2]|[1-2]?[0-9]))( +|$)+" - then - reserve_ipv4="$text" - if setconfig reserve_ipv4 "'$reserve_ipv4'"; then - msg_alert "已将保留地址网段设为：\033[32m$reserve_ipv4\033[0m" + while true; do + [ -z "$reserve_ipv4" ] && reserve_ipv4="0.0.0.0/8 10.0.0.0/8 127.0.0.0/8 100.64.0.0/10 169.254.0.0/16 172.16.0.0/12 192.168.0.0/16 224.0.0.0/4 240.0.0.0/4" + comp_box "\033[33m注意：地址必须是空格分隔，错误的设置可能导致网络回环或启动报错，请务必谨慎！\033[0m" \ + "" \ + "当前网段：" \ + "\033[36m$reserve_ipv4\033[0m" + btm_box "请直接输入自定义保留地址ipv4网段" \ + "或输入 0 返回上级菜单" + read -r -p "请输入> " text + if [ "$text" = 0 ]; then + break + elif + echo "$text" | grep -Eq "(((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])\.){3}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])/(3[0-2]|[1-2]?[0-9]))( +|$)+" + then + reserve_ipv4="$text" + if setconfig reserve_ipv4 "'$reserve_ipv4'"; then + msg_alert "已将保留地址网段设为：\033[32m$reserve_ipv4\033[0m" + else + msg_alert "\033[31m$COMMON_FAILED\033[0m" + fi else - msg_alert "\033[31m$COMMON_FAILED\033[0m" + msg_alert "\033[31m输入有误，请重新输入！\033[0m" fi - else - msg_alert "\033[31m输入有误，操作已取消！\033[0m" - fi + done ;; *) errornum @@ -124,6 +128,7 @@ set_common_ports() { content_line "3) 移除指定放行端口" content_line "4) 重置默认放行端口" content_line "5) 重置为旧版放行端口" + content_line "" common_back read -r -p "$COMMON_INPUT> " num case "$num" in @@ -144,55 +149,56 @@ set_common_ports() { fi ;; 2) - port_count=$(echo "$multiport" | awk -F',' '{print NF}') - if [ "$port_count" -ge 15 ]; then - format_box "\033[31m最多支持设置放行15个端口，请先减少一些！\033[0m" - else - content_line - format_box "当前已放行端口：\033[36m$multiport\033[0m" \ - "" \ - "请直接输入要放行的端口号" \ + while true; do + port_count=$(echo "$multiport" | awk -F',' '{print NF}') + if [ "$port_count" -ge 15 ]; then + comp_box "\033[31m最多支持设置放行15个端口，请先减少一些！\033[0m" + else + comp_box "当前已放行端口：\033[36m$multiport\033[0m" + btm_box "请直接输入要放行的端口号\n（每次只能输入一个端口号，切勿一次添加多个端口号）" \ + "或输入 0 返回上级菜单" + read -r -p "请输入> " port + if [ "$port" = 0 ]; then + break + elif echo ",$multiport," | grep -q ",$port,"; then + msg_alert "\033[31m输入错误！请勿重复添加！\033[0m" + elif [ "$port" -lt 1 ] || [ "$port" -gt 65535 ]; then + msg_alert "\033[31m输入错误！请输入正确的数值（1～65535）！\033[0m" + else + multiport=$(echo "$multiport,$port" | sed "s/^,//") + + if setconfig multiport "$multiport"; then + msg_alert "\033[32m$COMMON_SUCCESS\033[0m" + else + msg_alert "\033[31m$COMMON_FAILED\033[0m" + fi + fi + fi + done + ;; + 3) + while true; do + comp_box "当前已放行端口：\033[36m$multiport\033[0m" + btm_box "请直接输入要移除的端口号\n（每次只能输入一个端口号，切勿一次添加多个端口号）" \ "或输入 0 返回上级菜单" read -r -p "请输入> " port if [ "$port" = 0 ]; then - continue + break elif echo ",$multiport," | grep -q ",$port,"; then - msg_alert "\033[31m输入错误！请勿重复添加！\033[0m" - elif [ "$port" -lt 1 ] || [ "$port" -gt 65535 ]; then - msg_alert "\033[31m输入错误！请输入正确的数值（1～65535）！\033[0m" - else - multiport=$(echo "$multiport,$port" | sed "s/^,//") - - if setconfig multiport "$multiport"; then - msg_alert "\033[32m$COMMON_SUCCESS\033[0m" + if [ "$port" -lt 1 ] || [ "$port" -gt 65535 ]; then + msg_alert "\033[31m输入错误！请输入正确的数值（1～65535）！\033[0m" else - msg_alert "\033[31m$COMMON_FAILED\033[0m" + multiport=$(echo ",$multiport," | sed "s/,$port//; s/^,//; s/,$//") + if setconfig multiport "$multiport"; then + msg_alert "\033[32m$COMMON_SUCCESS\033[0m" + else + msg_alert "\033[31m$COMMON_FAILED\033[0m" + fi fi - fi - fi - ;; - 3) - format_box "当前已放行端口：\033[36m$multiport\033[0m" \ - "" \ - "请直接输入要移除的端口号" \ - "或输入 0 返回上级菜单" - read -r -p "请输入> " port - if [ "$port" = 0 ]; then - continue - elif echo ",$multiport," | grep -q ",$port,"; then - if [ "$port" -lt 1 ] || [ "$port" -gt 65535 ]; then - msg_alert "\033[31m输入错误！请输入正确的数值（1～65535）！\033[0m" else - multiport=$(echo ",$multiport," | sed "s/,$port//; s/^,//; s/,$//") - if setconfig multiport "$multiport"; then - msg_alert "\033[32m$COMMON_SUCCESS\033[0m" - else - msg_alert "\033[31m$COMMON_FAILED\033[0m" - fi + msg_alert "\033[31m输入错误！请输入已添加过的端口！\033[0m" fi - else - msg_alert "\033[31m输入错误！请输入已添加过的端口！\033[0m" - fi + done ;; 4) multiport='' @@ -222,7 +228,7 @@ set_cust_host_ipv4() { while true; do [ -z "$replace_default_host_ipv4" ] && replace_default_host_ipv4="OFF" . "$CRASHDIR"/starts/fw_getlanip.sh && getlanip - format_box "当前默认透明路由的网段为：\033[32m$host_ipv4\033[0m" \ + comp_box "当前默认透明路由的网段为：\033[32m$host_ipv4\033[0m" \ "当前已添加的自定义网段为：\033[36m$cust_host_ipv4\033[0m" content_line "1) 移除所有自定义网段" content_line "2) 使用自定义网段覆盖默认网段 \033[36m$replace_default_host_ipv4\033[0m" @@ -279,7 +285,7 @@ fw_filter_lan() { add_mac() { while true; do - format_box "手动输入mac地址时仅支持\033[32mxx:xx:xx:xx:xx:xx\033[0m的形式" + comp_box "手动输入mac地址时仅支持\033[32mxx:xx:xx:xx:xx:xx\033[0m的形式" content_line "已添加的mac地址：" content_line "" if [ -s "$CRASHDIR/configs/mac" ]; then @@ -308,14 +314,14 @@ fw_filter_lan() { i= break elif echo "$num" | grep -aEq '^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$'; then - if cat "$CRASHDIR"/configs/mac | grep -Eq "$num"; then + if [ -z "$(cat "$CRASHDIR"/configs/mac | grep -E "$num")" ]; then echo "$num" | grep -oE '^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$' >>"$CRASHDIR"/configs/mac else msg_alert "\033[31m已添加的设备，请勿重复添加！\033[0m" fi elif [ "$num" -le $(cat $dhcpdir 2>/dev/null | awk 'END{print NR}') ]; then macadd=$(cat "$dhcpdir" | awk '{print $2}' | sed -n "$num"p) - if cat "$CRASHDIR"/configs/mac | grep -Eq "$macadd"; then + if [ -z "$(cat "$CRASHDIR"/configs/mac | grep -E "$macadd")" ]; then echo "$macadd" >>"$CRASHDIR"/configs/mac else msg_alert "\033[31m已添加的设备，请勿重复添加！\033[0m" @@ -328,9 +334,10 @@ fw_filter_lan() { add_ip() { while true; do - format_box "手动输入时仅支持 \033[32m192.168.1.0/24\033[0m 或 \033[32m192.168.1.0\033[0m 的形式" \ + comp_box "手动输入时仅支持 \033[32m192.168.1.0/24\033[0m 或 \033[32m192.168.1.0\033[0m 的形式" \ "不支持ipv6地址过滤，如有需求请使用mac地址过滤" content_line "已添加的IP地址（段）：" + content_line "" if [ -s "$CRASHDIR/configs/ip_filter" ]; then while IFS= read -r line; do content_line "$line" @@ -339,7 +346,7 @@ fw_filter_lan() { content_line "暫未添加任何IP地址（段）" fi - separator_line "-" + separator_line "=" content_line "\033[33m序号 设备IP 设备名称\033[32m" if [ -s "$dhcpdir" ]; then awk '{print NR") "$3, $4}' "$dhcpdir" | @@ -357,14 +364,14 @@ fw_filter_lan() { i= break elif echo "$num" | grep -aEq '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(/(3[0-2]|[12]?[0-9]))?$'; then - if cat "$CRASHDIR"/configs/ip_filter | grep -Eq "$num"; then + if [ -z "$(cat "$CRASHDIR"/configs/ip_filter | grep -E "$num")" ]; then echo "$num" | grep -oE '^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)(/(3[0-2]|[12]?[0-9]))?$' >>"$CRASHDIR"/configs/ip_filter else msg_alert "\033[31m已添加的地址，请勿重复添加！\033[0m" fi elif [ "$num" -le "$(cat "$dhcpdir" 2>/dev/null | awk 'END{print NR}')" ]; then ipadd=$(cat "$dhcpdir" | awk '{print $3}' | sed -n "$num"p) - if cat "$CRASHDIR"/configs/mac | grep -Eq "$ipadd"; then + if [ -z "$(cat "$CRASHDIR"/configs/mac | grep -E "$ipadd")" ]; then echo "$ipadd" >>"$CRASHDIR"/configs/ip_filter else msg_alert "\033[31m已添加的地址，请勿重复添加！\033[0m" @@ -379,14 +386,15 @@ fw_filter_lan() { while true; do if [ -z "$(cat "$CRASHDIR"/configs/mac "$CRASHDIR"/configs/ip_filter 2>/dev/null)" ]; then msg_alert "\033[31m列表中没有需要移除的设备！\033[0m" + break else - format_box "请选择需要移除的设备：" - content_line "" - content_line " \033[32m设备IP \033[36m设备mac地址 \033[35m设备名称\033[0m" + comp_box "请选择需要移除的设备：" + content_line " \033[32m设备IP \033[36m设备mac地址 \033[35m设备名称\033[0m" i=1 for dev in $(cat "$CRASHDIR"/configs/mac "$CRASHDIR"/configs/ip_filter 2>/dev/null); do get_devinfo - content_line "$i) \033[32m$dev_ip \033[36m$dev_mac \033[35m$dev_name\033[0m" + content_line "$(printf "%s) \033[32m%-18s \033[36m%-18s \033[35m%s\033[0m" \ + "$i" "$dev_ip" "$dev_mac" "$dev_name")" i=$((i + 1)) done content_line "" @@ -426,21 +434,23 @@ fw_filter_lan() { fw_filter_lan_scrip='' fi - format_box "\033[30;47m请在此添加或移除设备\033[0m" \ + comp_box "\033[30;47m请在此添加或移除设备\033[0m" \ "" \ "当前过滤方式为：\033[33m$fw_filter_lan_type模式\033[0m" \ "仅列表内设备流量\033[36m$fw_filter_lan_scrip经过\033[0m内核" if [ -n "$(cat "$CRASHDIR"/configs/mac)" ]; then content_line "当前已过滤设备为：" content_line "" - content_line "\033[36m设备mac/ip地址\033[0m \033[35m设备名称\033[0m" + content_line " \033[36m设备mac/ip地址\033[0m \033[35m设备名称\033[0m" for dev in $(cat "$CRASHDIR"/configs/mac 2>/dev/null); do get_devinfo - content_line "\033[36m$dev_mac \033[35m$dev_name\033[0m" + content_line "$(printf "\033[36m%-20s \033[35m%s\033[0m" \ + "$dev_mac" "$dev_name")" done for dev in $(cat "$CRASHDIR"/configs/ip_filter 2>/dev/null); do get_devinfo - content_line "\033[36m$dev_ip \033[35m$dev_name\033[0m" + content_line "$(printf "\033[36m%-20s \033[35m%s\033[0m" \ + "$dev_ip" "$dev_name")" done separator_line "=" fi diff --git a/scripts/menus/uninstall.sh b/scripts/menus/uninstall.sh index 3e91208c..ebfcbf60 100644 --- a/scripts/menus/uninstall.sh +++ b/scripts/menus/uninstall.sh @@ -3,7 +3,7 @@ # 卸载 uninstall() { - format_box "\033[31m警告：\033[0m" \ + comp_box "\033[31m警告：\033[0m" \ "\033[31m该操作不可逆！\033" \ "是否确认卸载ShellCrash：" content_line "1) 是" @@ -20,7 +20,7 @@ uninstall() { # 移除安装目录 if [ -n "$CRASHDIR" ] && [ "$CRASHDIR" != '/' ]; then - format_box "是否保留脚本配置及订阅文件：" + comp_box "是否保留脚本配置及订阅文件：" content_line "1) 是" content_line "0) 否" separator_line "=" @@ -65,7 +65,7 @@ uninstall() { userdel -r shellcrash 2>/dev/null nvram set script_usbmount="" 2>/dev/null nvram commit 2>/dev/null - format_box "\033[36m已卸载ShellCrash相关文件！有缘再会！\033[0m" \ + comp_box "\033[36m已卸载ShellCrash相关文件！有缘再会！\033[0m" \ "\033[33m请手动关闭当前窗口以重置环境变量！\033[0m" line_break sleep 1