From 5aafe921986c98e76b555ea8fad94a68c45b01dd Mon Sep 17 00:00:00 2001 From: juewuy Date: Thu, 1 Jan 2026 10:43:25 +0800 Subject: [PATCH] =?UTF-8?q?~=E8=B0=83=E6=95=B4Tailscale=E7=9A=84=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E7=9B=AE=E5=BD=95=E4=B8=BA=E5=AE=89=E8=A3=85=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=AE=BE=E5=A4=87=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E8=AE=BE=E7=BD=AE=E9=80=89=E9=A1=B9=20~=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E9=83=A8=E5=88=86=E8=AE=BE=E5=A4=87=E5=BC=80=E6=9C=BA?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E5=A4=B1=E8=B4=A5=E7=9A=84bug=20~?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81=E7=BB=86=E8=8A=82=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/libs/get_config.sh | 2 +- scripts/libs/sb_endpoints.sh | 5 +++-- scripts/menus/7_gateway.sh | 6 ++++++ scripts/menus/9_upgrade.sh | 7 ++++--- scripts/start.sh | 2 +- scripts/starts/bfstart.sh | 1 + scripts/starts/general_init.sh | 6 +----- scripts/starts/shellcrash.openrc | 2 +- scripts/starts/snapshot_init.sh | 6 +++--- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/scripts/libs/get_config.sh b/scripts/libs/get_config.sh index e883e864..4f201a06 100644 --- a/scripts/libs/get_config.sh +++ b/scripts/libs/get_config.sh @@ -17,5 +17,5 @@ routing_mark=$((fwmark + 2)) [ -z "$dns_fallback" ] && dns_fallback="1.1.1.1, 8.8.8.8" [ -z "$dns_resolver" ] && { dns_resolver="223.5.5.5, 2400:3200::1" - cat /proc/net/udp | grep -q '0035' && dns_resolver='127.0.0.1' + cat /proc/net/udp | grep -q '0035' && dns_resolver='127.0.0.1, ::1' } \ No newline at end of file diff --git a/scripts/libs/sb_endpoints.sh b/scripts/libs/sb_endpoints.sh index 49c86f19..55751cfb 100644 --- a/scripts/libs/sb_endpoints.sh +++ b/scripts/libs/sb_endpoints.sh @@ -4,15 +4,16 @@ [ "$ts_service" = ON ] && { [ "$ts_subnet" = true ] && advertise_routes='"10.0.0.0/8", "172.16.0.0/12", "192.168.0.0/16"' [ -z "$ts_exit_node" ] && ts_exit_node=false + [ -z "$ts_hostname" ] && ts_hostname='ShellCrash' cat >"$TMPDIR"/jsons/tailscale.json < " num @@ -515,6 +516,11 @@ set_tailscale(){ setconfig ts_exit_node "$ts_exit_node" "$GT_CFG_PATH" set_tailscale ;; + 5) + read -p "请输入希望在Tailscale显示的设备名称 > " ts_hostname + setconfig ts_hostname "$ts_hostname" "$GT_CFG_PATH" + set_tailscale + ;; *) errornum ;; esac } diff --git a/scripts/menus/9_upgrade.sh b/scripts/menus/9_upgrade.sh index 61c270d7..1e29a98c 100644 --- a/scripts/menus/9_upgrade.sh +++ b/scripts/menus/9_upgrade.sh @@ -121,6 +121,7 @@ checkupdate(){ fi rm -rf "$TMPDIR"/version_new } + #更新脚本 getscripts(){ get_bin "$TMPDIR"/ShellCrash.tar.gz ShellCrash.tar.gz @@ -162,6 +163,7 @@ setscripts(){ exit; fi } + #更新内核 setcpucore(){ #手动设置内核架构 cpucore_list="armv5 armv7 arm64 386 amd64 mipsle-softfloat mipsle-hardfloat mips-softfloat" @@ -456,6 +458,7 @@ setcore(){ #内核选择菜单 ;; esac } + #数据库 getgeo(){ #下载Geo文件 #生成链接 @@ -485,7 +488,6 @@ getgeo(){ #下载Geo文件 fi sleep 1 } - getcustgeo(){ echo "-----------------------------------------------" echo "正在获取数据库文件…………" @@ -505,7 +507,6 @@ getcustgeo(){ fi sleep 1 } - checkcustgeo(){ [ "$api_tag" = "latest" ] && api_url=latest || api_url="tags/$api_tag" [ ! -s "$TMPDIR"/geo.list ] && { @@ -610,7 +611,6 @@ setcustgeo() { esac done } - setgeo() { while true; do . $CFG_PATH > /dev/null @@ -839,6 +839,7 @@ setdb(){ ;; esac } + #根证书 getcrt(){ echo "-----------------------------------------------" diff --git a/scripts/start.sh b/scripts/start.sh index 47f04d9a..7fe3e88b 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -2,7 +2,7 @@ # Copyright (C) Juewuy #初始化目录 -CRASHDIR=$( +[ -z "$CRASHDIR" ] && CRASHDIR=$( cd $(dirname $0) pwd ) diff --git a/scripts/starts/bfstart.sh b/scripts/starts/bfstart.sh index 56c6e3b3..8d3ad3a4 100644 --- a/scripts/starts/bfstart.sh +++ b/scripts/starts/bfstart.sh @@ -1,6 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy +#初始化目录 [ -z "$CRASHDIR" ] && CRASHDIR=$( cd $(dirname $0);cd ..;pwd) . "$CRASHDIR"/libs/get_config.sh [ -z "$BINDIR" -o -z "$TMPDIR" -o -z "$COMMAND" ] && . "$CRASHDIR"/init.sh >/dev/null 2>&1 diff --git a/scripts/starts/general_init.sh b/scripts/starts/general_init.sh index b34b2c7b..321b965a 100644 --- a/scripts/starts/general_init.sh +++ b/scripts/starts/general_init.sh @@ -2,11 +2,7 @@ # Copyright (C) Juewuy #初始化目录 -CRASHDIR=$( - cd $(dirname $0) - cd .. - pwd -) +[ -z "$CRASHDIR" ] && CRASHDIR=$( cd $(dirname $0);cd ..;pwd) profile=/etc/profile . "$CRASHDIR"/libs/set_profile.sh . "$CRASHDIR"/libs/set_cron.sh diff --git a/scripts/starts/shellcrash.openrc b/scripts/starts/shellcrash.openrc index 4d58297b..9d0ff118 100644 --- a/scripts/starts/shellcrash.openrc +++ b/scripts/starts/shellcrash.openrc @@ -6,7 +6,7 @@ description="Custom proxy service for ShellCrash" #获取目录 CRASHDIR=$(cat /etc/profile | grep CRASHDIR | awk -F "\"" '{print $2}') [ -z "$CRASHDIR" ] && CRASHDIR=$(cat ~/.bashrc | grep CRASHDIR | awk -F "\"" '{print $2}') -source ${CRASHDIR}/configs/command.env #加载启动命令和启动目录 +. ${CRASHDIR}/configs/command.env #加载启动命令和启动目录 # PID 文件 pidfile="/run/shellcrash.pid" diff --git a/scripts/starts/snapshot_init.sh b/scripts/starts/snapshot_init.sh index 6931b958..0d566b34 100644 --- a/scripts/starts/snapshot_init.sh +++ b/scripts/starts/snapshot_init.sh @@ -30,9 +30,9 @@ tunfix(){ mkdir -p /tmp/overlay mkdir -p /tmp/overlay/upper mkdir -p /tmp/overlay/work - mount -o noatime,lowerdir=${ko_dir},upperdir=/tmp/overlay/upper,workdir=/tmp/overlay/work -t overlay "overlay_mods_only" ${ko_dir} + mount -o noatime,lowerdir="$ko_dir",upperdir=/tmp/overlay/upper,workdir=/tmp/overlay/work -t overlay "overlay_mods_only" "$ko_dir" #将tun.ko链接到lib - ln -sf "$CRASHDIR"/tools/tun.ko ${ko_dir}/tun.ko + ln -sf "$CRASHDIR"/tools/tun.ko "$ko_dir"/tun.ko } tproxyfix(){ sed -i 's/sysctl -w net.bridge.bridge-nf-call-ip/#sysctl -w net.bridge.bridge-nf-call-ip/g' /etc/init.d/qca-nss-ecm @@ -90,7 +90,7 @@ case "$1" in auto_clean) auto_clean ;; init) init ;; *) - if [ -z $(pidof CrashCore) ];then + if [ -z "$(pidof CrashCore)" ];then init & fi ;;