diff --git a/scripts/menus/5_task.sh b/scripts/menus/5_task.sh index 1f509c60..9f186589 100644 --- a/scripts/menus/5_task.sh +++ b/scripts/menus/5_task.sh @@ -313,8 +313,8 @@ task_manager() { separator_line "=" # 抽取并生成临时列表 croncmd -l >"$TMPDIR"/task_cronlist - cat "$TMPDIR"/task_cronlist "$CRASHDIR"/task/running 2>/dev/null | sort -u | grep -oE "task/task.sh .*" | awk -F ' ' '{print $2" "$3}' >"$TMPDIR"/task_list - cat "$CRASHDIR"/task/bfstart "$CRASHDIR"/task/afstart "$CRASHDIR"/task/affirewall 2>/dev/null | awk -F ' ' '{print $2" "$3}' >>"$TMPDIR"/task_list + 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 2>/dev/null | sort -u | grep -oE " #.*" | grep -v "守护" | awk -F '#' '{print "0 旧版任务-"$2}' >>"$TMPDIR"/task_list sed -i '/^ *$/d' "$TMPDIR"/task_list rm -rf "$TMPDIR"/task_cronlist diff --git a/scripts/menus/6_core_config.sh b/scripts/menus/6_core_config.sh index 687d30bf..cdd465cf 100644 --- a/scripts/menus/6_core_config.sh +++ b/scripts/menus/6_core_config.sh @@ -164,7 +164,7 @@ setproviders() { text=$(printf "%.12s" "$text" | sed 's/ //g') # 截断12字符+去空格 if [ "$text" = 0 ]; then break - elif [ -n "$text" ] && [ -z "$(echo "$text" | grep -E '^[0-9]+$')" ] && ! grep -q "^$text " "$CRASHDIR"/configs/providers.cfg; then + elif [ -n "$text" ] && [ -z "$(echo "$text" | grep -E '^[0-9]+$')" ] && ! grep -q "^$text " "$CRASHDIR"/configs/providers.cfg 2>/dev/null; then name="$text" common_success break @@ -272,10 +272,10 @@ setproviders() { ;; d) if [ -n "$name" ] && [ -n "$link" ]; then - sed -i "/^$name /d" "$CRASHDIR"/configs/providers.cfg + sed -i "/^$name /d" "$CRASHDIR"/configs/providers.cfg 2>/dev/null msg_alert "\033[32m$COMMON_SUCCESS\033[0m" elif [ -n "$name" ] && [ -n "$link_uri" ]; then - sed -i "/^$name /d" "$CRASHDIR"/configs/providers_uri.cfg + sed -i "/^$name /d" "$CRASHDIR"/configs/providers_uri.cfg 2>/dev/null msg_alert "\033[32m$COMMON_SUCCESS\033[0m" fi break diff --git a/scripts/menus/8_tools.sh b/scripts/menus/8_tools.sh index bd9cf3f6..8c8d484d 100644 --- a/scripts/menus/8_tools.sh +++ b/scripts/menus/8_tools.sh @@ -207,11 +207,11 @@ tools() { separator_line "=" content_line "1) 我已知晓,出现问题会自行承担!" content_line "0) 返回上级菜单" - eparator_line "=" + separator_line "=" read -r -p "请输入对应标号> " res if [ "$res" = 1 ]; then line_break - eparator_line "=" + separator_line "=" content_line "正在连接服务器获取Tun模块补丁文件......" get_bin "$TMPDIR"/tun.ko bin/fix/tun.ko if [ "$?" = "0" ]; then @@ -221,7 +221,7 @@ tools() { else content_line "\033[31m文件下载失败,请重试!\033[0m" fi - eparator_line "=" + separator_line "=" else continue fi diff --git a/scripts/menus/subconverter.sh b/scripts/menus/subconverter.sh index c91faf30..e953315f 100644 --- a/scripts/menus/subconverter.sh +++ b/scripts/menus/subconverter.sh @@ -28,9 +28,9 @@ subconverter() { break ;; 1) - providers_link=$(grep -v '\./providers/' "$CRASHDIR"/configs/providers.cfg 2>/dev/null | awk '{print $2}' | paste -sd '|') - uri_link=$(grep -v '^#' "$CRASHDIR"/configs/providers_uri.cfg 2>/dev/null | awk '{ print ($1=="vmess" ? $2 : $2 "#" $1) }' | paste -sd '|') - Url=$(echo "$providers_link|$uri_link" | sed 's/^|// ; s/|$//') + providers_link=$(grep -v '\./providers/' "$CRASHDIR"/configs/providers.cfg 2>/dev/null | awk '{print $2}' | tr '\n' '|') + uri_link=$(grep -v '^#' "$CRASHDIR"/configs/providers_uri.cfg 2>/dev/null | awk '{ print ($1=="vmess" ? $2 : $2 "#" $1) }' | tr '\n' '|') + Url=$(echo "$providers_link|$uri_link" | sed 's/||*/|/g; s/^|//; s/|$//') setconfig Url "'$Url'" Https='' setconfig Https