~优化文件结构,准备将bin文件放到单独分支
This commit is contained in:
@@ -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特殊处理
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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(){
|
||||
|
||||
Reference in New Issue
Block a user