diff --git a/scripts/libs/web_get_bin.sh b/scripts/libs/web_get_bin.sh index 1ba78e69..d434b670 100644 --- a/scripts/libs/web_get_bin.sh +++ b/scripts/libs/web_get_bin.sh @@ -7,9 +7,9 @@ get_bin() { #专用于项目内部文件的下载 echo "$2" | grep -q '^bin/' && rt=update #/bin文件改为在update分支下载 echo "$2" | grep -qE '^public/|^rules/' && rt=dev #/public和/rules文件改为在dev分支下载 if [ "$url_id" = 101 -o "$url_id" = 104 ]; then - bin_url="$(grep "$url_id" "$CRASHDIR"/configs/servers.list | awk '{print $3}')@$rt/$2" #jsdelivr特殊处理 + bin_url="$(grep "$url_id" "$CRASHDIR"/configs/servers_chs.list | awk '{print $3}')@$rt/$2" #jsdelivr特殊处理 else - bin_url="$(grep "$url_id" "$CRASHDIR"/configs/servers.list | awk '{print $3}')/$rt/$2" + bin_url="$(grep "$url_id" "$CRASHDIR"/configs/servers_chs.list | awk '{print $3}')/$rt/$2" fi else bin_url="$update_url/$2" diff --git a/scripts/starts/core_config.sh b/scripts/starts/core_config.sh index 634fad78..256b3a68 100644 --- a/scripts/starts/core_config.sh +++ b/scripts/starts/core_config.sh @@ -7,10 +7,13 @@ . "$CRASHDIR"/libs/compare.sh . "$CRASHDIR"/libs/set_config.sh . "$CRASHDIR"/libs/logger.sh +. "$CRASHDIR"/libs/i18n.sh -update_servers() { #更新servers.list - get_bin "$TMPDIR"/servers.list public/servers.list - [ "$?" = 0 ] && mv -f "$TMPDIR"/servers.list "$CRASHDIR"/configs/servers.list +load_lang + +update_servers() { #更新servers_${i18n}.list + get_bin "$TMPDIR"/servers_${i18n}.list public/servers_${i18n}.list + [ "$?" = 0 ] && mv -f "$TMPDIR"/servers_${i18n}.list "$CRASHDIR"/configs/servers_${i18n}.list } gen_ua(){ #自动生成ua [ -z "$user_agent" -o "$user_agent" = "auto" ] && { @@ -26,10 +29,10 @@ gen_ua(){ #自动生成ua } get_core_config() { #下载内核配置文件 [ -z "$rule_link" ] && rule_link=1 - [ -z "$server_link" ] || [ $server_link -gt $(grep -aE '^4' "$CRASHDIR"/configs/servers.list | wc -l) ] && server_link=1 - Server=$(grep -aE '^3|^4' "$CRASHDIR"/configs/servers.list | sed -n ""$server_link"p" | awk '{print $3}') - Server_ua=$(grep -aE '^4' "$CRASHDIR"/configs/servers.list | sed -n ""$server_link"p" | awk '{print $4}') - Config=$(grep -aE '^5' "$CRASHDIR"/configs/servers.list | sed -n ""$rule_link"p" | awk '{print $3}') + [ -z "$server_link" ] || [ $server_link -gt $(grep -aE '^4' "$CRASHDIR"/configs/servers_${i18n}.list | wc -l) ] && server_link=1 + Server=$(grep -aE '^3|^4' "$CRASHDIR"/configs/servers_${i18n}.list | sed -n ""$server_link"p" | awk '{print $3}') + Server_ua=$(grep -aE '^4' "$CRASHDIR"/configs/servers_${i18n}.list | sed -n ""$server_link"p" | awk '{print $4}') + Config=$(grep -aE '^5' "$CRASHDIR"/configs/servers_${i18n}.list | sed -n ""$rule_link"p" | awk '{print $3}') gen_ua #如果传来的是Url链接则合成Https链接,否则直接使用Https链接 if [ -z "$Https" ]; then