Austin/ShellCrash
1
0
Fork 0
mirror of https://github.com/juewuy/ShellCrash.git synced 2024-11-16 03:32:34 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'dev' into nft-tun

Browse Source 
# Conflicts:
#	bin/ShellCrash.tar.gz
#	bin/clashfm.tar.gz
#	bin/public.tar.gz
#	bin/version
#	scripts/init.sh
This commit is contained in:
juewuy 2024-03-09 12:09:40 +08:00
commit 66a9ce2215
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bin/release_version
View File

@ -1,7 +1,8 @@
1.8.0
1.7.0
1.6.3
1.5.1
1.3.0
1.2.0
1.1.0
1.9.0
1.8.0
1.7.0
1.6.3
1.5.1
1.3.0
1.2.0
1.1.0

12
scripts/task.sh
View File

@ -93,20 +93,24 @@ update_scripts(){ #自动更新脚本
logger "任务【自动更新脚本】中止-未检测到版本更新"
exit 1
else
${CRASHDIR}/start.sh get_bin ${TMPDIR}/update.tar.gz "bin/update.tar.gz"
${CRASHDIR}/start.sh get_bin ${TMPDIR}/clashfm.tar.gz "bin/update.tar.gz"
if [ "$?" != "0" ];then
rm -rf ${TMPDIR}/update.tar.gz
rm -rf ${TMPDIR}/clashfm.tar.gz
logger "任务【自动更新内核】出错-下载失败！"
return 1
else
#停止服务
${CRASHDIR}/start.sh stop
#解压
tar -zxf "${TMPDIR}/update.tar.gz" ${tar_para} -C ${CRASHDIR}/
tar -zxf "${TMPDIR}/clashfm.tar.gz" ${tar_para} -C ${CRASHDIR}/
if [ $? -ne 0 ];then
rm -rf ${TMPDIR}/update.tar.gz
rm -rf ${TMPDIR}/clashfm.tar.gz
logger "任务【自动更新内核】出错-解压失败！"
${CRASHDIR}/start.sh start
return 1
else
source ${CRASHDIR}/init.sh >/dev/null
${CRASHDIR}/start.sh start
return 0
fi
fi