diff --git a/bin/ShellCrash.tar.gz b/bin/ShellCrash.tar.gz index 962c75f..e893800 100644 Binary files a/bin/ShellCrash.tar.gz and b/bin/ShellCrash.tar.gz differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index f069e86..1122f2a 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/bin/public.tar.gz b/bin/public.tar.gz index 7cbb429..ca87661 100644 Binary files a/bin/public.tar.gz and b/bin/public.tar.gz differ diff --git a/bin/version b/bin/version index 71318ae..1eeaaff 100644 --- a/bin/version +++ b/bin/version @@ -5,4 +5,4 @@ meta_v=v1.18.0 singbox_v=1.7.8 GeoIP_v=20240107 -versionsh=1.8.7b +versionsh=1.8.7c diff --git a/scripts/getdate.sh b/scripts/getdate.sh index f1d557a..8b6c6a6 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -1756,7 +1756,10 @@ userguide(){ echo -e "\033[0m每次开机后首次运行服务时都会自动的重新下载相关文件\033[0m" echo ----------------------------------------------- read -p "是否开启?(1/0) > " res - [ "$res" = 1 ] && setconfig BINDIR /tmp/ShellCrash ${CRASHDIR}/configs/command.env + [ "$res" = 1 ] && { + BINDIR=/tmp/ShellCrash + setconfig BINDIR /tmp/ShellCrash ${CRASHDIR}/configs/command.env + } fi #检测及下载根证书 if [ -d /etc/ssl/certs -a ! -f '/etc/ssl/certs/ca-certificates.crt' ];then diff --git a/scripts/init.sh b/scripts/init.sh index 0ef389d..b460fec 100644 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -1,7 +1,7 @@ #!/bin/sh # Copyright (C) Juewuy -version=1.8.7b +version=1.8.7c setdir(){ dir_avail(){ diff --git a/scripts/start.sh b/scripts/start.sh index ab0309b..a173a7f 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -213,16 +213,6 @@ check_clash_config(){ #检查clash配置文件 done < ${TMPDIR}/clash_proxies_$USER rm -rf ${TMPDIR}/clash_proxies_$USER } - #使用核心内置test功能检测 - if [ -x ${BINDIR}/CrashCore ];then - ${BINDIR}/CrashCore -t -d ${BINDIR} -f $core_config_new >/dev/null - if [ "$?" != "0" ];then - logger "配置文件加载失败!请查看报错信息!" 31 - ${BINDIR}/CrashCore -t -d ${BINDIR} -f $core_config_new - echo "$($BINDIR/CrashCore -t -d $BINDIR -f $core_config_new)" >> ${TMPDIR}/ShellCrash.log - exit 1 - fi - fi } check_singbox_config(){ #检查singbox配置文件 #使用核心内置format功能检测并格式化