~i18h
This commit is contained in:
@@ -214,7 +214,7 @@ settings() {
|
||||
;;
|
||||
1)
|
||||
echo chs >"$CRASHDIR"/configs/i18n.cfg
|
||||
msg_alert "\033[32m$SET_SWITCH_RERUN\033[0m"
|
||||
msg_alert "\033[32m切换成功,请重新执行脚本!\033[0m"
|
||||
;;
|
||||
2)
|
||||
echo en >"$CRASHDIR"/configs/i18n.cfg
|
||||
|
||||
@@ -111,7 +111,7 @@ task_add() {
|
||||
while true; do
|
||||
comp_box "\033[36m$TASK5_SELECT_ADD\033[0m"
|
||||
# 输出任务列表
|
||||
list=$(cat "$CRASHDIR"/task/task.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | awk -F '#' '{print $3}')
|
||||
list=$(cat "$CRASHDIR"/task/task_${i18n}.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | awk -F '#' '{print $3}')
|
||||
list_box "$list"
|
||||
btm_box "" \
|
||||
"0) $COMMON_BACK"
|
||||
|
||||
@@ -1111,19 +1111,20 @@ saveserver() {
|
||||
setserver() {
|
||||
while true; do
|
||||
line_break
|
||||
LISTFILE="$CRASHDIR"/configs/servers_"$i18n".list
|
||||
[ -z "$release_type" ] && release_name=$UPG_SOURCE_UNSET
|
||||
[ -n "$release_type" ] && release_name="$release_type$UPG_SOURCE_ROLLBACK_TAG"
|
||||
[ "$release_type" = stable ] && release_name=$UPG_SOURCE_STABLE_TEXT
|
||||
[ "$release_type" = master ] && release_name=$UPG_SOURCE_MASTER_TEXT
|
||||
[ "$release_type" = dev ] && release_name=$UPG_SOURCE_DEV_TEXT
|
||||
[ -n "$url_id" ] && url_name=$(grep "$url_id" "$CRASHDIR"/configs/servers.list 2>/dev/null | awk '{print $2}') || url_name="$update_url"
|
||||
[ -n "$url_id" ] && url_name=$(grep "$url_id" "$LISTFILE" 2>/dev/null | awk '{print $2}') || url_name="$update_url"
|
||||
|
||||
comp_box "\033[30;47m$UPG_SOURCE_TITLE\033[0m" \
|
||||
"" \
|
||||
"$UPG_SOURCE_CUR_VER\033[4;33m$release_name\033[0m" \
|
||||
"$UPG_SOURCE_CUR_URL\n\033[4;32m$url_name\033[0m"
|
||||
|
||||
grep -E "^1|$release_name" "$CRASHDIR"/configs/servers.list |
|
||||
grep -E "^1|^2" "$LISTFILE" |
|
||||
awk '{print NR") "$2}' |
|
||||
while IFS= read -r line; do
|
||||
content_line "$line"
|
||||
@@ -1145,12 +1146,12 @@ setserver() {
|
||||
break
|
||||
;;
|
||||
[1-99])
|
||||
url_id_new=$(grep -E "^1|$release_name" "$CRASHDIR"/configs/servers.list | sed -n "$num"p | awk '{print $1}')
|
||||
url_id_new=$(grep -E "^1|$release_name" "$LISTFILE" | sed -n "$num"p | awk '{print $1}')
|
||||
if [ -z "$url_id_new" ]; then
|
||||
errornum
|
||||
continue
|
||||
elif [ "$url_id_new" -ge 200 ]; then
|
||||
update_url=$(grep -E "^1|$release_name" "$CRASHDIR"/configs/servers.list | sed -n "$num"p | awk '{print $3}')
|
||||
update_url=$(grep -E "^1|$release_name" "$LISTFILE" | sed -n "$num"p | awk '{print $3}')
|
||||
url_id=''
|
||||
saveserver
|
||||
break
|
||||
@@ -1257,7 +1258,3 @@ setserver() {
|
||||
esac
|
||||
done
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
|
||||
. "$CRASHDIR"/libs/set_cron.sh
|
||||
|
||||
load_lang bot_tg
|
||||
|
||||
bot_tg_start(){
|
||||
. "$CRASHDIR"/starts/start_legacy.sh
|
||||
start_legacy "$CRASHDIR/menus/bot_tg.sh" 'bot_tg'
|
||||
@@ -14,5 +12,5 @@ bot_tg_stop(){
|
||||
rm -f "$TMPDIR/bot_tg.pid"
|
||||
}
|
||||
bot_tg_cron(){
|
||||
cronset "$BOT_TG_CRON_NAME" "* * * * * /bin/sh $CRASHDIR/starts/start_legacy_wd.sh bot_tg #$BOT_TG_CRON_NAME"
|
||||
cronset 'ShellCrash-TG_BOT' "* * * * * /bin/sh $CRASHDIR/starts/start_legacy_wd.sh bot_tg #ShellCrash-TG_BOT"
|
||||
}
|
||||
|
||||
@@ -9,6 +9,8 @@ __IS_MODULE_SUBCONVERTER=1
|
||||
|
||||
load_lang subconverter
|
||||
|
||||
LISTFILE="$CRASHDIR"/configs/servers_"$i18n".list
|
||||
|
||||
# Subconverter在线订阅转换
|
||||
subconverter() {
|
||||
while true; do
|
||||
@@ -115,8 +117,8 @@ gen_link_ele() {
|
||||
|
||||
# 选择在线规则模版
|
||||
gen_link_config() {
|
||||
list=$(grep -aE '^5' "$CRASHDIR"/configs/servers.list | awk '{print $2$4}')
|
||||
now=$(grep -aE '^5' "$CRASHDIR"/configs/servers.list | sed -n ""$rule_link"p" | awk '{print $2}')
|
||||
list=$(grep -aE '^5' "$LISTFILE" | awk '{print $2$4}')
|
||||
now=$(grep -aE '^5' "$LISTFILE" | sed -n ""$rule_link"p" | awk '{print $2}')
|
||||
comp_box "$SUBCONVERTER_RULE_CURRENT\033[33m$now\033[0m"
|
||||
list_box "$list"
|
||||
content_line ""
|
||||
@@ -140,8 +142,8 @@ gen_link_config() {
|
||||
|
||||
# 选择Subconverter服务器
|
||||
gen_link_server() {
|
||||
list=$(grep -aE '^3|^4' "$CRASHDIR"/configs/servers.list | awk '{print $3" "$2}')
|
||||
now=$(grep -aE '^3|^4' "$CRASHDIR"/configs/servers.list | sed -n ""$server_link"p" | awk '{print $3}')
|
||||
list=$(grep -aE '^3|^4' "$LISTFILE" | awk '{print $3" "$2}')
|
||||
now=$(grep -aE '^3|^4' "$LISTFILE" | sed -n ""$server_link"p" | awk '{print $3}')
|
||||
|
||||
comp_box "\033[36m$SUBCONVERTER_SERVER_HINT\033[0m" \
|
||||
"\033[32m$SUBCONVERTER_SERVER_THANKS\033[0m" \
|
||||
|
||||
Reference in New Issue
Block a user