From 302df84f5801d84d1e06fe9be1579ab4eac5454a Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@gmail.com>
Date: Tue, 13 Feb 2024 22:22:07 +0800
Subject: [PATCH] =?UTF-8?q?~=E4=BF=AE=E5=A4=8Dproviders=E5=8F=AA=E9=92=88?=
 =?UTF-8?q?=E5=AF=B9=E5=8D=95=E4=B8=AA=E6=8F=90=E4=BE=9B=E5=95=86=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E7=9A=84bug=20~providers=E6=A8=A1=E7=89=88=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E4=B8=8B=E8=BD=BD=E5=88=B0=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E8=80=8C=E9=9D=9E=E5=AE=89=E8=A3=85=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/getdate.sh | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index bdcdfcc..3b46ad2 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -355,10 +355,10 @@ EOF
 		provider_temp_file=$(grep "provider_temp_${coretype}" ${CRASHDIR}/configs/ShellCrash.cfg | awk -F '=' '{print $2}')
 	fi
 	echo -----------------------------------------------
-	if [ ! -s ${CRASHDIR}/providers/${provider_temp_file} ];then
+	if [ ! -s ${TMPDIR}/providers/${provider_temp_file} ];then
 		echo -e "\033[33m未找到本地模版，尝试在线获取！\033[0m"
-		mkdir -p ${CRASHDIR}/providers
-		${CRASHDIR}/start.sh get_bin ${CRASHDIR}/providers/${provider_temp_file} rules/${coretype}_providers/${provider_temp_file}
+		mkdir -p ${TMPDIR}/providers
+		${CRASHDIR}/start.sh get_bin ${TMPDIR}/providers/${provider_temp_file} rules/${coretype}_providers/${provider_temp_file}
 		[ "$?" != 0 ] && {
 			echo -e "\033[31m下载失败，请尝试更换安装源！\033[0m"
 			setserver
@@ -375,6 +375,8 @@ EOF
 	#生成providers模块
 	if [ -n "$2" ];then
 		gen_clash_providers_txt $1 $2
+		providers_tags=$1
+		sed -i 's/, {providers_tags}//g' ${TMPDIR}/providers/proxy-groups.yaml
 	else
 		providers_tags=''
 		while read line;do
@@ -401,6 +403,7 @@ EOF
 		}
 	else
 		rm -rf ${TMPDIR}/CrashCore
+		#rm -rf ${TMPDIR}/config.yaml
 		echo -e "\033[31m生成配置文件出错，请仔细检查输入！\033[0m"
 	fi
 }
@@ -426,10 +429,10 @@ EOF
 		provider_temp_file=$(grep "provider_temp_${coretype}" ${CRASHDIR}/configs/ShellCrash.cfg | awk -F '=' '{print $2}')
 	fi
 	echo -----------------------------------------------
-	if [ ! -s ${CRASHDIR}/providers/${provider_temp_file} ];then
+	if [ ! -s ${TMPDIR}/providers/${provider_temp_file} ];then
 		echo -e "\033[33m未找到本地模版，尝试在线获取！\033[0m"
-		mkdir -p ${CRASHDIR}/providers
-		${CRASHDIR}/start.sh get_bin ${CRASHDIR}/providers/${provider_temp_file} rules/${coretype}_providers/${provider_temp_file}
+		mkdir -p ${TMPDIR}/providers
+		${CRASHDIR}/start.sh get_bin ${TMPDIR}/providers/${provider_temp_file} rules/${coretype}_providers/${provider_temp_file}
 		[ "$?" != 0 ] && {
 			echo -e "\033[31m下载失败，请尝试更换安装源！\033[0m"
 			setserver
@@ -443,13 +446,14 @@ EOF
 {
   "outbound_providers": [
 EOF
-	cat > ${TMPDIR}/providers/outbounds_add.json <<EOF
+	if [ -n "$2" ];then
+		gen_singbox_providers_txt $1 $2
+		providers_tags=\"$1\"
+	else
+		cat > ${TMPDIR}/providers/outbounds_add.json <<EOF
 {
   "outbounds": [
 EOF
-	if [ -n "$2" ];then
-		gen_singbox_providers_txt $1 $2
-	else
 		providers_tags=''
 		while read line;do
 			tag=$(echo $line | awk '{print $1}')
@@ -458,9 +462,9 @@ EOF
 			gen_singbox_providers_txt $tag $url
 			echo '{ "tag": "'${tag}'", "type": "urltest", "tolerance": 100, "providers": "'${tag}'", "includes": ".*" },' >> ${TMPDIR}/providers/outbounds_add.json
 		done < ${CRASHDIR}/configs/providers.cfg
+		sed -i '$s/},/}]}/' ${TMPDIR}/providers/outbounds_add.json #修复文件格式
 	fi
 	sed -i '$s/},/}]}/' ${TMPDIR}/providers/providers.json #修复文件格式
-	sed -i '$s/},/}]}/' ${TMPDIR}/providers/outbounds_add.json #修复文件格式
 	#使用模版生成outbounds和rules模块
 	cat ${CRASHDIR}/providers/${provider_temp_file} | sed "s/{providers_tags}/$providers_tags/g" >> ${TMPDIR}/providers/outbounds.json
 	#调用内核测试
@@ -534,7 +538,7 @@ setproviders(){ #自定义providers
 				fi
 			;;	
 			3)
-				gen_outbound_providers $provider_name $provider_url
+				gen_${coretype}_providers $provider_name $provider_url
 			;;	
 			4)
 				sed -i "/$provider_name/d" $CRASHDIR/configs/providers.cfg