~调整Tailscale的缓存目录为安装目录，增加设备名称设置选项

~修复部分设备开机初始化失败的bug
~部分代码细节优化

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'
 }

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 <<EOF
 {
   "endpoints": [
     {
 	  "type": "tailscale",
 	  "tag": "ts-ep",
-	  "state_directory": "/tmp/ShellCrash/tailscale",
+	  "state_directory": "$CRASHDIR/tailscale",
 	  "auth_key": "$ts_auth_key",
-	  "hostname": "ShellCrash-ts-ep",
+	  "hostname": "$ts_hostname",
 	  "advertise_routes": [$advertise_routes],
 	  "advertise_exit_node": $ts_exit_node,
 	  "udp_timeout": "5m"

scripts/menus/7_gateway.sh

@@ -480,6 +480,7 @@ set_tailscale(){
 	echo -e " 2 设置\033[36m秘钥\033[0m(Auth Key)		$ts_auth_key_info"
 	echo -e " 3 通告路由\033[33m内网地址\033[0m(Subnet)	\033[36m$ts_subnet\033[0m"
 	echo -e " 4 通告路由\033[31m全部流量\033[0m(EXIT-NODE)	\033[36m$ts_exit_node\033[0m"
+	echo -e " 5 设置\033[36m设备名称\033[0m(可选)		$ts_hostname"
 	echo -e " 0 返回上级菜单 \033[0m"
 	echo "-----------------------------------------------"
 	read -p "请输入对应数字 > " 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		
 }

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 "-----------------------------------------------"

scripts/start.sh

@@ -2,7 +2,7 @@
 # Copyright (C) Juewuy
 
 #初始化目录
-CRASHDIR=$(
+[ -z "$CRASHDIR" ] && CRASHDIR=$(
     cd $(dirname $0)
     pwd
 )

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

scripts/starts/general_init.sh

@@ -2,11 +2,7 @@
 # Copyright (C) Juewuy
 
 #初始化目录
-CRASHDIR=$(
+[ -z "$CRASHDIR" ] && CRASHDIR=$( cd $(dirname $0);cd ..;pwd)
-    cd $(dirname $0)
-	cd ..
-    pwd
-)
 profile=/etc/profile
 . "$CRASHDIR"/libs/set_profile.sh
 . "$CRASHDIR"/libs/set_cron.sh

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"

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
 	;;