xm/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2026-07-25 00:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'juewuy:dev' into dev

Browse Source
This commit is contained in:
DustinWin
2026-07-07 10:45:02 +08:00
committed by GitHub
parent b31c824f94 bbc0b35b16
commit a85cd5b505
28 changed files with 207 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/menus/2_settings.sh
View File

@@ -203,8 +203,8 @@ settings() {
exit 0
;;
b)
comp_box "1) $SET_LANG_ZH" \
"2) $SET_LANG_EN" \
comp_box "1) 简体中文" \
"2) English" \
"" \
"0) $COMMON_BACK"
read -r -p "$COMMON_INPUT> " num

47
scripts/menus/5_task.sh
View File

@@ -7,6 +7,7 @@ __IS_MODULE_5_TASK_LOADED=1
# 通用工具
. "$CRASHDIR"/libs/set_config.sh
. "$CRASHDIR"/libs/set_cron.sh
[ -z "$TASKCFGDIR" ] && TASKCFGDIR="$CRASHDIR"/configs/task
load_lang 5_task
@@ -32,7 +33,8 @@ set_cron() {
set_service() {
# 参数1代表要任务类型,参数2代表任务ID,参数3代表任务描述,参数4代表running任务cron时间
task_file="$CRASHDIR"/task/$1
mkdir -p "$TASKCFGDIR"
task_file="$TASKCFGDIR"/$1
[ -s "$task_file" ] && sed -i "/$3/d" "$task_file"
# 运行时每分钟执行的任务特殊处理
if [ "$1" = "running" ]; then
@@ -53,7 +55,7 @@ task_user_add() {
while true; do
comp_box "\033[33m$TASK5_USER_ADD_HINT1\033[0m" \
"\033[36m$TASK5_USER_ADD_HINT2\033[0m" \
"$TASK5_USER_ADD_HINT3\033[32m${CRASHDIR}/task/task.user\033[0m$TASK5_USER_ADD_HINT4"
"$TASK5_USER_ADD_HINT3\033[32m${TASKCFGDIR}/task.user\033[0m$TASK5_USER_ADD_HINT4"
btm_box "\033[36m$TASK5_INPUT_CMD\033[0m" \
"$TASK5_OR_BACK"
read -r -p "$TASK5_INPUT> " script
@@ -63,12 +65,12 @@ task_user_add() {
task_command=$script
comp_box "$TASK5_CHECK_INPUT\033[32m$task_command\033[0m"
# 获取本任务ID
task_max_id=$(awk -F '#' '{print $1}' "$CRASHDIR"/task/task.user 2>/dev/null | sort -n | tail -n 1)
task_max_id=$(awk -F '#' '{print $1}' "$TASKCFGDIR"/task.user 2>/dev/null | sort -n | tail -n 1)
[ -z "$task_max_id" ] && task_max_id=200
task_id=$((task_max_id + 1))
read -r -p "$TASK5_INPUT_REMARK> " txt
[ -n "$txt" ] && task_name=$txt || task_name="$TASK5_CUSTOM_TASK$task_id"
echo "$task_id#$task_command#$task_name" >>"$CRASHDIR"/task/task.user
echo "$task_id#$task_command#$task_name" >>"$TASKCFGDIR"/task.user
msg_alert "\033[32m$TASK5_CUSTOM_ADDED\033[0m"
break
else
@@ -80,10 +82,10 @@ task_user_add() {
# 自定义命令删除
task_user_del() {
while true; do
if grep -Evq '^#' "$CRASHDIR/task/task.user" 2>/dev/null; then
if grep -Evq '^#' "$TASKCFGDIR/task.user" 2>/dev/null; then
comp_box "$TASK5_USER_DEL_HINT1" \
"$TASK5_USER_DEL_HINT2\033[32m${CRASHDIR}/task/task.user\033[0m"
grep -Ev '^#' "$CRASHDIR/task/task.user" 2>/dev/null |
"$TASK5_USER_DEL_HINT2\033[32m${TASKCFGDIR}/task.user\033[0m"
grep -Ev '^#' "$TASKCFGDIR/task.user" 2>/dev/null |
awk -F '#' '{print $1") "$3}' |
while IFS= read -r line; do
content_line "$line"
@@ -94,7 +96,7 @@ task_user_del() {
if [ "$num" = 0 ]; then
break
elif [ -n "$num" ]; then
sed -i "/^$num#/d" "$CRASHDIR"/task/task.user 2>/dev/null
sed -i "/^$num#/d" "$TASKCFGDIR"/task.user 2>/dev/null
common_success
else
msg_alert "\033[31m$TASK5_INPUT_ERROR\033[0m"
@@ -111,7 +113,7 @@ task_add() {
while true; do
comp_box "\033[36m$TASK5_SELECT_ADD\033[0m"
# 输出任务列表
list=$(cat "$CRASHDIR"/task/task_${i18n}.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | awk -F '#' '{print $3}')
list=$(cat "$CRASHDIR"/task/task_${i18n}.list "$TASKCFGDIR"/task.user 2>/dev/null | grep -Ev '^(#|$)' | awk -F '#' '{print $3}')
list_box "$list"
btm_box "" \
"0) $COMMON_BACK"
@@ -122,8 +124,8 @@ task_add() {
;;
[1-9] | [1-9][0-9])
if [ "$num" -le "$(echo "$list" | wc -l)" ]; then
task_id=$(cat "$CRASHDIR"/task/task_${i18n}.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $1}')
task_name=$(cat "$CRASHDIR"/task/task_${i18n}.list "$CRASHDIR"/task/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $3}')
task_id=$(cat "$CRASHDIR"/task/task_${i18n}.list "$TASKCFGDIR"/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $1}')
task_name=$(cat "$CRASHDIR"/task/task_${i18n}.list "$TASKCFGDIR"/task.user 2>/dev/null | grep -Ev '^(#|$)' | sed -n "$num p" | awk -F '#' '{print $3}')
task_type
break
else
@@ -142,11 +144,11 @@ task_del() {
# 删除定时任务
cronset "$1"
# 删除条件任务
sed -i "/$1/d" "$CRASHDIR"/task/cron 2>/dev/null
sed -i "/$1/d" "$CRASHDIR"/task/bfstart 2>/dev/null
sed -i "/$1/d" "$CRASHDIR"/task/afstart 2>/dev/null
sed -i "/$1/d" "$CRASHDIR"/task/running 2>/dev/null
sed -i "/$1/d" "$CRASHDIR"/task/affirewall 2>/dev/null
sed -i "/$1/d" "$TASKCFGDIR"/cron 2>/dev/null
sed -i "/$1/d" "$TASKCFGDIR"/bfstart 2>/dev/null
sed -i "/$1/d" "$TASKCFGDIR"/afstart 2>/dev/null
sed -i "/$1/d" "$TASKCFGDIR"/running 2>/dev/null
sed -i "/$1/d" "$TASKCFGDIR"/affirewall 2>/dev/null
}
# 任务条件选择菜单
@@ -244,8 +246,8 @@ task_manager() {
while true; do
# 抽取并生成临时列表
cronload >"$TMPDIR"/task_cronlist
cat "$TMPDIR"/task_cronlist "$CRASHDIR"/task/running 2>/dev/null | sort -u | grep -oE "task/task.sh .*" | cut -d ' ' -f 2- >"$TMPDIR"/task_list
cat "$CRASHDIR"/task/bfstart "$CRASHDIR"/task/afstart "$CRASHDIR"/task/affirewall 2>/dev/null | cut -d ' ' -f 2- >>"$TMPDIR"/task_list
cat "$TMPDIR"/task_cronlist "$TASKCFGDIR"/running 2>/dev/null | sort -u | grep -oE "task/task.sh .*" | cut -d ' ' -f 2- >"$TMPDIR"/task_list
cat "$TASKCFGDIR"/bfstart "$TASKCFGDIR"/afstart "$TASKCFGDIR"/affirewall 2>/dev/null | cut -d ' ' -f 2- >>"$TMPDIR"/task_list
cat "$TMPDIR"/task_cronlist 2>/dev/null | sort -u | grep -oE " #.*" | grep -v "$TASK5_GUARD_WORD" | awk -F '#' '{print "0 '$TASK5_OLD_PREFIX'"$2}' >>"$TMPDIR"/task_list
sed -i '/^ *$/d' "$TMPDIR"/task_list
rm -rf "$TMPDIR"/task_cronlist
@@ -286,13 +288,13 @@ task_manager() {
if [ "$res" = 1 ]; then
cronname=$(echo "$task_txt" | awk -F '-' '{print $2}')
cronset "$cronname"
sed -i "/$cronname/d" "$CRASHDIR"/task/cron 2>/dev/null
sed -i "/$cronname/d" "$TASKCFGDIR"/cron 2>/dev/null
break
fi
else
task_des=$(echo "$task_txt" | awk '{print $2}')
task_name=$(cat "$CRASHDIR"/task/task_${i18n}.list "$CRASHDIR"/task/task.user 2>/dev/null | grep "$task_id" | awk -F '#' '{print $3}')
task_name=$(cat "$CRASHDIR"/task/task_${i18n}.list "$TASKCFGDIR"/task.user 2>/dev/null | grep "$task_id" | awk -F '#' '{print $3}')
comp_box "$TASK5_CURRENT_TASK\033[36m$task_des\033[0m"
btm_box "1) $TASK5_EDIT_TASK" \
"2) $TASK5_DEL_TASK" \
@@ -313,7 +315,7 @@ task_manager() {
common_success
;;
3)
task_command=$(cat "$CRASHDIR"/task/task_${i18n}.list "$CRASHDIR"/task/task.user 2>/dev/null | grep "$task_id" | awk -F '#' '{print $2}')
task_command=$(cat "$CRASHDIR"/task/task_${i18n}.list "$TASKCFGDIR"/task.user 2>/dev/null | grep "$task_id" | awk -F '#' '{print $2}')
eval "$task_command" && task_res="$TASK5_RUN_OK" || task_res="$TASK5_RUN_FAIL"
msg_alert "\033[33m$TASK5_TASK_PREFIX$task_des】$task_res\033[0m"
;;
@@ -367,7 +369,8 @@ task_recom() {
task_menu() {
while true; do
# 检测并创建自定义任务文件
[ -f "$CRASHDIR"/task/task.user ] || echo "$TASK5_USER_FILE_HEADER" >"$CRASHDIR"/task/task.user
mkdir -p "$TASKCFGDIR"
[ -f "$TASKCFGDIR"/task.user ] || echo "$TASK5_USER_FILE_HEADER" >"$TASKCFGDIR"/task.user
comp_box "\033[30;47m$TASK5_MENU_TITLE\033[0m"
btm_box "1) $TASK5_MENU_1" \
"2) $TASK5_MENU_2" \

2
scripts/menus/9_upgrade.sh
View File

@@ -409,7 +409,7 @@ setcustcore() {
"3) \033[36mSagerNet/sing-box\033[32m@release\033[0m$UPG_CUSTOM_CORE_MENU_OFFICIAL" \
"4) \033[36mDustinWin/mihomo\033[0m$UPG_CUSTOM_CORE_MENU_MULTI" \
"5) \033[36mDustinWin/sing-boxr\033[0m$UPG_CUSTOM_CORE_MENU_MULTI" \
"$UPG_CORE_MENU_9" \
"9) $UPG_CUSTOM_CORE_LINK_MENU" \
"" \
"0) $COMMON_BACK"
read -r -p "$COMMON_INPUT> " num

57
scripts/menus/dns.sh
View File

@@ -185,13 +185,17 @@ set_dns_adv() {
"PROXY-DNS：" \
"\033[36m$dns_fallback\033[0m" \
"" \
"DEFAULT-DNS：" \
"RESOLVER-DNS：" \
"\033[33m$dns_resolver\033[0m" \
"" \
"PROXY-SERVER-DNS：" \
"\033[33m$dns_proxy_server\033[0m" \
""
btm_box "1) $DNS_ADV_EDIT_DIRECT" \
"2) $DNS_ADV_EDIT_PROXY" \
"3) $DNS_ADV_EDIT_DEFAULT" \
"4) \033[32m$DNS_ADV_AUTO_ENCRYPT\033[0m" \
"3) $DNS_ADV_EDIT_RESOLVER" \
"4) $DNS_ADV_EDIT_PROXY_SERVER" \
"5) \033[32m$DNS_ADV_AUTO_ENCRYPT\033[0m" \
"9) \033[33m$DNS_ADV_RESET\033[0m" \
"" \
"0) $COMMON_BACK"
@@ -201,9 +205,9 @@ set_dns_adv() {
break
;;
1)
comp_box "$DNS_DIRECT_NOW\033[32m$dns_nameserver\033[0m"
btm_box "\033[36m$DNS_INPUT_DIRECT_NEW\033[0m" \
"$DNS_INPUT_DIRECT_RESET" \
comp_box "$DNS_NOW\033[32m$dns_nameserver\033[0m"
btm_box "\033[36m$DNS_INPUT_NEW\033[0m" \
"$DNS_INPUT_RESET" \
"$DNS_INPUT_REDIR_BACK"
read -r -p "$DNS_INPUT> " res
case "$res" in
@@ -227,9 +231,9 @@ set_dns_adv() {
esac
;;
2)
comp_box "$DNS_PROXY_NOW\033[32m$dns_fallback\033[0m"
btm_box "\033[36m$DNS_INPUT_PROXY_NEW\033[0m" \
"$DNS_INPUT_PROXY_RESET" \
comp_box "$DNS_NOW\033[32m$dns_fallback\033[0m"
btm_box "\033[36m$DNS_INPUT_NEW\033[0m" \
"$DNS_INPUT_RESET" \
"$DNS_INPUT_REDIR_BACK"
read -r -p "$DNS_INPUT> " res
case "$res" in
@@ -253,9 +257,9 @@ set_dns_adv() {
esac
;;
3)
comp_box "$DNS_DEFAULT_NOW\033[32m$dns_resolver\033[0m"
btm_box "\033[36m$DNS_INPUT_DEFAULT_NEW\033[0m" \
"$DNS_INPUT_DEFAULT_RESET" \
comp_box "$DNS_NOW\033[32m$dns_resolver\033[0m"
btm_box "\033[36m$DNS_INPUT_NEW\033[0m" \
"$DNS_INPUT_RESET" \
"$DNS_INPUT_REDIR_BACK"
separator_line "="
read -r -p "$DNS_INPUT> " res
@@ -266,7 +270,7 @@ set_dns_adv() {
"r")
dns_resolver="223.5.5.5, 2400:3200::1"
setconfig dns_resolver "'$dns_resolver'"
common_failed
common_success
;;
*)
if echo "$res" | grep -qE '://.*::'; then
@@ -280,6 +284,33 @@ set_dns_adv() {
esac
;;
4)
comp_box "$DNS_NOW\033[32m$dns_proxy_server\033[0m"
btm_box "\033[36m$DNS_INPUT_NEW\033[0m" \
"$DNS_INPUT_RESET" \
"$DNS_INPUT_REDIR_BACK"
separator_line "="
read -r -p "$DNS_INPUT> " res
case "$res" in
0)
continue
;;
"r")
dns_proxy_server="$dns_resolver"
setconfig dns_proxy_server "'$dns_proxy_server'"
common_success
;;
*)
if echo "$res" | grep -qE '://.*::'; then
msg_alert "\033[31m$DNS_IPV6_NOT_SUPPORT\033[0m"
else
dns_proxy_server=$(echo "$res" | sed 's#|#,\ #g')
setconfig dns_proxy_server "'$dns_proxy_server'"
msg_alert "\033[32m$COMMON_SUCCESS\033[0m"
fi
;;
esac
;;
5)
line_break
separator_line "="
if echo "$crashcore" | grep -qE 'meta|singbox'; then

3
scripts/menus/providers_singbox.sh
View File

@@ -117,7 +117,6 @@ EOF
fi
# 通用部分生成
[ "$skip_cert" != "OFF" ] && override_tls='true' || override_tls='false'
[ -n "$(echo "$2" | grep 'oics.net')" ] && domain_resolver='dns_oix' || domain_resolver='dns_resolver'
cat >>"$TMPDIR"/providers/providers.json <<EOF
"health_check": {
"enabled": true,
@@ -126,7 +125,7 @@ EOF
"timeout": "3s"
},
"override_dialer": {
"domain_resolver": "$domain_resolver"
"domain_resolver": "$dns_proxy_server"
},
"override_tls": {
"enabled": true,

4
scripts/menus/subconverter.sh
View File

@@ -124,7 +124,7 @@ gen_link_config() {
content_line ""
common_back
read -r -p "$COMMON_INPUT> " num
totalnum=$(grep -acE '^5' "$CRASHDIR"/configs/servers.list)
totalnum=$(grep -acE '^5' "$CRASHDIR"/configs/servers_"$i18n".list)
if [ -z "$num" ] || [ "$num" -gt "$totalnum" ]; then
errornum
elif [ "$num" = 0 ]; then
@@ -153,7 +153,7 @@ gen_link_server() {
content_line ""
common_back
read -r -p "$COMMON_INPUT> " num
totalnum=$(grep -acE '^3|^4' "$CRASHDIR"/configs/servers.list)
totalnum=$(grep -acE '^3|^4' "$CRASHDIR"/configs/servers_"$i18n".list)
if [ -z "$num" ] || [ "$num" -gt "$totalnum" ]; then
errornum
elif [ "$num" = 0 ]; then

5
scripts/menus/task_cmd.sh
View File

@@ -10,6 +10,7 @@
. "$CRASHDIR"/libs/web_get_bin.sh
. "$CRASHDIR"/libs/logger.sh
. "$CRASHDIR"/libs/i18n.sh
[ -z "$TASKCFGDIR" ] && TASKCFGDIR="$CRASHDIR"/configs/task
load_lang task_cmd
@@ -140,8 +141,8 @@ hotupdate() { #热更新订阅
case "$1" in
[1-9][0-9][0-9])
task_command=$(cat "$CRASHDIR"/task/task_${i18n}.list "$CRASHDIR"/task/task.user 2>/dev/null | grep "$1" | awk -F '#' '{print $2}')
task_name=$(cat "$CRASHDIR"/task/task_${i18n}.list "$CRASHDIR"/task/task.user 2>/dev/null | grep "$1" | awk -F '#' '{print $3}')
task_command=$(cat "$CRASHDIR"/task/task_${i18n}.list "$TASKCFGDIR"/task.user 2>/dev/null | grep "$1" | awk -F '#' '{print $2}')
task_name=$(cat "$CRASHDIR"/task/task_${i18n}.list "$TASKCFGDIR"/task.user 2>/dev/null | grep "$1" | awk -F '#' '{print $3}')
#task_logger "任务$task_name 开始执行"
eval $task_command && task_res="$TASK_CMD_RES_OK" || task_res="$TASK_CMD_RES_FAIL"
task_logger "$TASK_CMD_EXEC_PREFIX$2$TASK_CMD_EXEC_MID$task_res"

25
scripts/menus/userguide.sh
View File

@@ -4,7 +4,26 @@
[ -n "$__IS_MODULE_USERGUIDE_LOADED" ] && return
__IS_MODULE_USERGUIDE_LOADED=1
load_lang userguide
. "$CRASHDIR"/libs/check_dir_avail.sh
select_lang() {
line_break
comp_box "1) 简体中文" \
"2) English"
read -r -p "请选择语言 Please choose your language > " num
case "$num" in
1)
echo chs >"$CRASHDIR"/configs/i18n.cfg
;;
2)
echo en >"$CRASHDIR"/configs/i18n.cfg
;;
esac
line_break
load_lang menu
load_lang common
load_lang userguide
}
forwhat() {
while true; do
@@ -89,7 +108,9 @@ forwhat() {
# 新手引导
userguide() {
. "$CRASHDIR"/libs/check_dir_avail.sh
select_lang
forwhat
# 检测小内存模式