From 3b2c4f7a1320ffac185a523a103257ce21c3a380 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@gmail.com>
Date: Sat, 13 Apr 2024 20:36:48 +0800
Subject: [PATCH] =?UTF-8?q?~=E4=BF=AE=E5=A4=8D=E5=9B=A0=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E5=AF=BC=E8=87=B4=E7=9A=84bug=20~=E9=80=82=E9=85=8Dv2?=
 =?UTF-8?q?bapi=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/start.sh  |  9 +++------
 scripts/update.sh | 45 +++++++++++++++++++++++++++++++--------------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/scripts/start.sh b/scripts/start.sh
index 296f5c5..e56a0f1 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -2,10 +2,7 @@
 # Copyright (C) Juewuy
 
 #初始化目录
-CRASHDIR=$(
-	cd $(dirname $0)
-	pwd
-)
+CRASHDIR=$(cd $(dirname $0);pwd)
 #加载执行目录，失败则初始化
 . "$CRASHDIR"/configs/command.env >/dev/null 2>&1
 [ -z "$BINDIR" -o -z "$TMPDIR" -o -z "$COMMAND" ] && . "$CRASHDIR"/init.sh >/dev/null 2>&1
@@ -49,7 +46,7 @@ getconfig() { #读取配置及全局变量
 setconfig() { #脚本配置工具
 	#参数1代表变量名，参数2代表变量值,参数3即文件路径
 	[ -z "$3" ] && configpath="$CRASHDIR"/configs/ShellCrash.cfg || configpath="${3}"
-	grep -q ""$1"=" "$configpath" && sed -i "s#"$1"=.*#"$1"="$2"#g" "$configpath" || echo ""$1"="$2"" >> "$configpath"
+	grep -q "${1}=" "$configpath" && sed -i "s#${1}=.*#${1}=${2}#g" "$configpath" || echo "${1}=${2}" >> "$configpath"
 }
 ckcmd() { #检查命令是否存在
 	command -v sh >/dev/null 2>&1 && command -v "$1" >/dev/null 2>&1 || type "$1" >/dev/null 2>&1
@@ -1540,7 +1537,7 @@ core_check() { #检查及下载内核文件
 }
 core_exchange() { #升级为高级内核
 	#$1：目标内核  $2：提示语句
-	logger "检测到"$2"！将改为使用"$1"核心启动！" 33
+	logger "检测到${2}！将改为使用${1}核心启动！" 33
 	rm -rf "$TMPDIR"/CrashCore
 	rm -rf "$BINDIR"/CrashCore
 	rm -rf "$BINDIR"/CrashCore.tar.gz
diff --git a/scripts/update.sh b/scripts/update.sh
index 0c166c5..a116f6f 100644
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -1010,7 +1010,11 @@ set_core_config(){ #配置文件功能
 	echo -e "\033[30;47m ShellCrash配置文件管理\033[0m"
 	echo -----------------------------------------------
 	echo -e " 1 在线\033[32m生成$crashcore配置文件\033[0m"
-	echo -e " 2 在线\033[33m获取完整配置文件\033[0m"
+	if [ -f "$CRASHDIR"/v2b_api.sh ];then
+		echo -e " 2 登录\033[33m获取订阅(推荐！)\033[0m"
+	else
+		echo -e " 2 在线\033[33m获取完配置文件\033[0m"
+	fi
 	echo -e " 3 本地\033[32m生成providers配置文件\033[0m"	
 	echo -e " 4 本地\033[33m上传完整配置文件\033[0m"
 	echo -e " 5 设置\033[36m自动更新\033[0m"
@@ -1039,20 +1043,25 @@ set_core_config(){ #配置文件功能
 		gen_core_config_link
 	;;
 	2)
-		echo -----------------------------------------------
-		echo -e "\033[33m此功能可能会导致一些bug！！！\033[0m"
-		echo -e "强烈建议你使用\033[32m在线生成配置文件功能！\033[0m"
-		echo -e "\033[33m继续后如出现任何问题，请务必自行解决，一切提问恕不受理！\033[0m"
-		echo -----------------------------------------------
-		sleep 1
-		read -p "我确认遇到问题可以自行解决[1/0] > " res
-		if [ "$res" = '1' ]; then
-			set_core_config_link
+		if [ -f "$CRASHDIR"/v2b_api.sh ];then
+			. "$CRASHDIR"/v2b_api.sh
+			set_core_config
 		else
 			echo -----------------------------------------------
-			echo -e "\033[32m正在跳转……\033[0m"
+			echo -e "\033[33m此功能可能会导致一些bug！！！\033[0m"
+			echo -e "强烈建议你使用\033[32m在线生成配置文件功能！\033[0m"
+			echo -e "\033[33m继续后如出现任何问题，请务必自行解决，一切提问恕不受理！\033[0m"
+			echo -----------------------------------------------
 			sleep 1
-			gen_core_config_link
+			read -p "我确认遇到问题可以自行解决[1/0] > " res
+			if [ "$res" = '1' ]; then
+				set_core_config_link
+			else
+				echo -----------------------------------------------
+				echo -e "\033[32m正在跳转……\033[0m"
+				sleep 1
+				gen_core_config_link
+			fi
 		fi
 	;;
 	3)
@@ -2313,10 +2322,18 @@ userguide(){
 	[ ! -s $CRASHDIR/yamls/config.yaml -a ! -s $CRASHDIR/jsons/config.json ] && {
 		echo -----------------------------------------------
 		echo -e "\033[32m是否导入配置文件？\033[0m(这是运行前的最后一步)"
-		echo -e "\033[0m你必须拥有一份yaml格式的配置文件才能运行服务！\033[0m"
+		echo -e "\033[0m你必须拥有一份配置文件才能运行服务！\033[0m"
 		echo -----------------------------------------------
 		read -p "现在开始导入？(1/0) > " res
-		[ "$res" = 1 ] && inuserguide=1 && set_core_config && inuserguide=""
+		[ "$res" = 1 ] && inuserguide=1 && {
+			if [ -f "$CRASHDIR"/v2b_api.sh ];then
+				. "$CRASHDIR"/v2b_api.sh
+			else
+				set_core_config
+			fi
+			set_core_config
+			inuserguide=""
+		}
 	}
 	#回到主界面
 	echo -----------------------------------------------