diff --git a/ShellCrash.tar.gz b/ShellCrash.tar.gz new file mode 100644 index 0000000..dfae747 Binary files /dev/null and b/ShellCrash.tar.gz differ diff --git a/bin/ShellCrash.tar.gz b/bin/ShellCrash.tar.gz deleted file mode 100644 index 3535d51..0000000 Binary files a/bin/ShellCrash.tar.gz and /dev/null differ diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz deleted file mode 100644 index 8c3f5eb..0000000 Binary files a/bin/clashfm.tar.gz and /dev/null differ diff --git a/bin/public.tar.gz b/bin/public.tar.gz deleted file mode 100644 index ef06b03..0000000 Binary files a/bin/public.tar.gz and /dev/null differ diff --git a/install.sh b/install.sh index ce0a02e..cb5d08f 100644 --- a/install.sh +++ b/install.sh @@ -49,7 +49,7 @@ error_down() { } #安装及初始化 gettar() { - webget /tmp/ShellCrash.tar.gz "$url/bin/ShellCrash.tar.gz" + webget /tmp/ShellCrash.tar.gz "$url/ShellCrash.tar.gz" if [ "$result" != "200" ]; then $echo "\033[33m文件下载失败!\033[0m" error_down @@ -259,8 +259,8 @@ if [ -n "$(echo $url | grep master)" ]; then setversion fi #获取版本信息 -webget /tmp/version "$url/bin/version" echooff -[ "$result" = "200" ] && versionsh=$(cat /tmp/version | grep "versionsh" | awk -F "=" '{print $2}') +webget /tmp/version "$url/version" echooff +[ "$result" = "200" ] && versionsh=$(cat /tmp/version) rm -rf /tmp/version #输出 diff --git a/scripts/start.sh b/scripts/start.sh index 6a48226..a0bd433 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -210,7 +210,7 @@ get_bin() { #专用于项目内部文件的下载 . "$CRASHDIR"/configs/ShellCrash.cfg >/dev/null [ -z "$update_url" ] && update_url=https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@master if [ -n "$url_id" ]; then - echo "$2" | grep -q '^/bin' && release_type=update #/bin文件改为在update分支下载 + echo "$2" | grep -q '^bin/' && release_type=update #/bin文件改为在update分支下载 [ -z "$release_type" ] && release_type=master if [ "$url_id" = 101 -o "$url_id" = 104 ]; then url="$(grep "$url_id" "$CRASHDIR"/configs/servers.list | awk '{print $3}')@$release_type/$2" #jsdelivr特殊处理 diff --git a/scripts/task.sh b/scripts/task.sh index c12ba33..aca1959 100644 --- a/scripts/task.sh +++ b/scripts/task.sh @@ -20,13 +20,13 @@ ckcmd(){ #检查命令是否存在 #任务命令 check_update(){ #检查更新工具 - ${CRASHDIR}/start.sh get_bin ${TMPDIR}/crashversion "bin/version" echooff + ${CRASHDIR}/start.sh get_bin ${TMPDIR}/crashversion "$1" echooff [ "$?" = "0" ] && . ${TMPDIR}/crashversion 2>/dev/null rm -rf ${TMPDIR}/crashversion } update_core(){ #自动更新内核 #检查版本 - check_update + check_update bin/version crash_v_new=$(eval echo \$${crashcore}_v) if [ -z "$crash_v_new" -o "$crash_v_new" = "$core_v" ];then logger "任务【自动更新内核】中止-未检测到版本更新" @@ -88,7 +88,7 @@ update_core(){ #自动更新内核 } update_scripts(){ #自动更新脚本 #检查版本 - check_update + check_update version if [ -z "$versionsh" -o "$versionsh" = "versionsh_l" ];then logger "任务【自动更新脚本】中止-未检测到版本更新" exit 1 @@ -119,7 +119,7 @@ update_scripts(){ #自动更新脚本 update_mmdb(){ #自动更新数据库 getgeo(){ #检查版本 - check_update + check_update bin/version geo_v="$(echo $2 | awk -F "." '{print $1}')_v" #获取版本号类型比如Country_v geo_v_new=$GeoIP_v geo_v_now=$(eval echo \$$geo_v) diff --git a/scripts/webget.sh b/scripts/webget.sh index be6a240..bc4979a 100644 --- a/scripts/webget.sh +++ b/scripts/webget.sh @@ -1185,7 +1185,7 @@ set_core_config(){ #配置文件功能 } #下载更新相关 getscripts(){ #更新脚本文件 - ${CRASHDIR}/start.sh get_bin ${TMPDIR}/update.tar.gz bin/clashfm.tar.gz + ${CRASHDIR}/start.sh get_bin ${TMPDIR}/ShellCrash.tar.gz ShellCrash.tar.gz if [ "$?" != "0" ];then echo -e "\033[33m文件下载失败!\033[0m" error_down @@ -1195,7 +1195,7 @@ getscripts(){ #更新脚本文件 echo ----------------------------------------------- echo 开始解压文件! mkdir -p ${CRASHDIR} > /dev/null - tar -zxf "${TMPDIR}/update.tar.gz" ${tar_para} -C ${CRASHDIR}/ + tar -zxf "${TMPDIR}/ShellCrash.tar.gz" ${tar_para} -C ${CRASHDIR}/ if [ $? -ne 0 ];then echo -e "\033[33m文件解压失败!\033[0m" error_down @@ -1204,7 +1204,7 @@ getscripts(){ #更新脚本文件 echo -e "\033[32m脚本更新成功!\033[0m" fi fi - rm -rf ${TMPDIR}/update.tar.gz + rm -rf ${TMPDIR}/ShellCrash.tar.gz exit } setscripts(){