mirror of
https://github.com/juewuy/ShellCrash.git
synced 2026-03-10 23:41:22 +00:00
~1.9.3alpha2.1打包
~修复新手引导和自启网络检测的相关bug
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -1,4 +1,4 @@
|
|||||||
meta_v=v1.19.17
|
meta_v=v1.19.17
|
||||||
singboxr_v=1.13.0-alpha.27
|
singboxr_v=1.13.0-alpha.27
|
||||||
versionsh=1.9.4alpha2
|
versionsh=1.9.4alpha2.1
|
||||||
GeoIP_v=20251205
|
GeoIP_v=20251205
|
||||||
|
|||||||
@@ -666,7 +666,7 @@ debug(){
|
|||||||
|
|
||||||
#新手引导
|
#新手引导
|
||||||
userguide(){
|
userguide(){
|
||||||
|
. "$CRASHDIR"/libs/check_dir_avail.sh
|
||||||
forwhat(){
|
forwhat(){
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
echo -e "\033[30;46m 欢迎使用ShellCrash新手引导! \033[0m"
|
echo -e "\033[30;46m 欢迎使用ShellCrash新手引导! \033[0m"
|
||||||
@@ -765,7 +765,7 @@ userguide(){
|
|||||||
setconfig dns_resolver "'$dns_resolver'"
|
setconfig dns_resolver "'$dns_resolver'"
|
||||||
fi
|
fi
|
||||||
#启用推荐的自动任务配置
|
#启用推荐的自动任务配置
|
||||||
. "$CRASHDIR"/menus/task.sh && task_recom
|
. "$CRASHDIR"/menus/5_task.sh && task_recom
|
||||||
#小米设备软固化
|
#小米设备软固化
|
||||||
if [ "$systype" = "mi_snapshot" ];then
|
if [ "$systype" = "mi_snapshot" ];then
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
|
|||||||
@@ -70,7 +70,7 @@ EOF
|
|||||||
|
|
||||||
routing_mark=$((fwmark + 2))
|
routing_mark=$((fwmark + 2))
|
||||||
#检测网络连接
|
#检测网络连接
|
||||||
[ "$network_check" != "已禁用" ] && [ ! -f "$TMPDIR"/crash_start_time ] && ckcmd ping && . "$CRASHDIR"/starts/network_check && network_check
|
[ "$network_check" != "已禁用" ] && [ ! -f "$TMPDIR"/crash_start_time ] && ckcmd ping && . "$CRASHDIR"/starts/check_network.sh && check_network
|
||||||
[ ! -d "$BINDIR"/ui ] && mkdir -p "$BINDIR"/ui
|
[ ! -d "$BINDIR"/ui ] && mkdir -p "$BINDIR"/ui
|
||||||
[ -z "$crashcore" ] && crashcore=meta
|
[ -z "$crashcore" ] && crashcore=meta
|
||||||
#执行条件任务
|
#执行条件任务
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Copyright (C) Juewuy
|
# Copyright (C) Juewuy
|
||||||
|
|
||||||
network_check() { #检查是否联网
|
check_network() { #检查是否联网
|
||||||
for text in 223.5.5.5 1.2.4.8 dns.alidns.com doh.pub; do
|
for text in 223.5.5.5 1.2.4.8 dns.alidns.com doh.pub; do
|
||||||
ping -c 3 $text >/dev/null 2>&1 && return 0
|
ping -c 3 $text >/dev/null 2>&1 && return 0
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|||||||
Reference in New Issue
Block a user