~优化文件结构,准备将bin文件放到单独分支
This commit is contained in:
BIN
ShellCrash.tar.gz
Normal file
BIN
ShellCrash.tar.gz
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -49,7 +49,7 @@ error_down() {
|
|||||||
}
|
}
|
||||||
#安装及初始化
|
#安装及初始化
|
||||||
gettar() {
|
gettar() {
|
||||||
webget /tmp/ShellCrash.tar.gz "$url/bin/ShellCrash.tar.gz"
|
webget /tmp/ShellCrash.tar.gz "$url/ShellCrash.tar.gz"
|
||||||
if [ "$result" != "200" ]; then
|
if [ "$result" != "200" ]; then
|
||||||
$echo "\033[33m文件下载失败!\033[0m"
|
$echo "\033[33m文件下载失败!\033[0m"
|
||||||
error_down
|
error_down
|
||||||
@@ -259,8 +259,8 @@ if [ -n "$(echo $url | grep master)" ]; then
|
|||||||
setversion
|
setversion
|
||||||
fi
|
fi
|
||||||
#获取版本信息
|
#获取版本信息
|
||||||
webget /tmp/version "$url/bin/version" echooff
|
webget /tmp/version "$url/version" echooff
|
||||||
[ "$result" = "200" ] && versionsh=$(cat /tmp/version | grep "versionsh" | awk -F "=" '{print $2}')
|
[ "$result" = "200" ] && versionsh=$(cat /tmp/version)
|
||||||
rm -rf /tmp/version
|
rm -rf /tmp/version
|
||||||
|
|
||||||
#输出
|
#输出
|
||||||
|
|||||||
@@ -210,7 +210,7 @@ get_bin() { #专用于项目内部文件的下载
|
|||||||
. "$CRASHDIR"/configs/ShellCrash.cfg >/dev/null
|
. "$CRASHDIR"/configs/ShellCrash.cfg >/dev/null
|
||||||
[ -z "$update_url" ] && update_url=https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@master
|
[ -z "$update_url" ] && update_url=https://testingcf.jsdelivr.net/gh/juewuy/ShellCrash@master
|
||||||
if [ -n "$url_id" ]; then
|
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
|
[ -z "$release_type" ] && release_type=master
|
||||||
if [ "$url_id" = 101 -o "$url_id" = 104 ]; then
|
if [ "$url_id" = 101 -o "$url_id" = 104 ]; then
|
||||||
url="$(grep "$url_id" "$CRASHDIR"/configs/servers.list | awk '{print $3}')@$release_type/$2" #jsdelivr特殊处理
|
url="$(grep "$url_id" "$CRASHDIR"/configs/servers.list | awk '{print $3}')@$release_type/$2" #jsdelivr特殊处理
|
||||||
|
|||||||
@@ -20,13 +20,13 @@ ckcmd(){ #检查命令是否存在
|
|||||||
|
|
||||||
#任务命令
|
#任务命令
|
||||||
check_update(){ #检查更新工具
|
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
|
[ "$?" = "0" ] && . ${TMPDIR}/crashversion 2>/dev/null
|
||||||
rm -rf ${TMPDIR}/crashversion
|
rm -rf ${TMPDIR}/crashversion
|
||||||
}
|
}
|
||||||
update_core(){ #自动更新内核
|
update_core(){ #自动更新内核
|
||||||
#检查版本
|
#检查版本
|
||||||
check_update
|
check_update bin/version
|
||||||
crash_v_new=$(eval echo \$${crashcore}_v)
|
crash_v_new=$(eval echo \$${crashcore}_v)
|
||||||
if [ -z "$crash_v_new" -o "$crash_v_new" = "$core_v" ];then
|
if [ -z "$crash_v_new" -o "$crash_v_new" = "$core_v" ];then
|
||||||
logger "任务【自动更新内核】中止-未检测到版本更新"
|
logger "任务【自动更新内核】中止-未检测到版本更新"
|
||||||
@@ -88,7 +88,7 @@ update_core(){ #自动更新内核
|
|||||||
}
|
}
|
||||||
update_scripts(){ #自动更新脚本
|
update_scripts(){ #自动更新脚本
|
||||||
#检查版本
|
#检查版本
|
||||||
check_update
|
check_update version
|
||||||
if [ -z "$versionsh" -o "$versionsh" = "versionsh_l" ];then
|
if [ -z "$versionsh" -o "$versionsh" = "versionsh_l" ];then
|
||||||
logger "任务【自动更新脚本】中止-未检测到版本更新"
|
logger "任务【自动更新脚本】中止-未检测到版本更新"
|
||||||
exit 1
|
exit 1
|
||||||
@@ -119,7 +119,7 @@ update_scripts(){ #自动更新脚本
|
|||||||
update_mmdb(){ #自动更新数据库
|
update_mmdb(){ #自动更新数据库
|
||||||
getgeo(){
|
getgeo(){
|
||||||
#检查版本
|
#检查版本
|
||||||
check_update
|
check_update bin/version
|
||||||
geo_v="$(echo $2 | awk -F "." '{print $1}')_v" #获取版本号类型比如Country_v
|
geo_v="$(echo $2 | awk -F "." '{print $1}')_v" #获取版本号类型比如Country_v
|
||||||
geo_v_new=$GeoIP_v
|
geo_v_new=$GeoIP_v
|
||||||
geo_v_now=$(eval echo \$$geo_v)
|
geo_v_now=$(eval echo \$$geo_v)
|
||||||
|
|||||||
@@ -1185,7 +1185,7 @@ set_core_config(){ #配置文件功能
|
|||||||
}
|
}
|
||||||
#下载更新相关
|
#下载更新相关
|
||||||
getscripts(){ #更新脚本文件
|
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
|
if [ "$?" != "0" ];then
|
||||||
echo -e "\033[33m文件下载失败!\033[0m"
|
echo -e "\033[33m文件下载失败!\033[0m"
|
||||||
error_down
|
error_down
|
||||||
@@ -1195,7 +1195,7 @@ getscripts(){ #更新脚本文件
|
|||||||
echo -----------------------------------------------
|
echo -----------------------------------------------
|
||||||
echo 开始解压文件!
|
echo 开始解压文件!
|
||||||
mkdir -p ${CRASHDIR} > /dev/null
|
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
|
if [ $? -ne 0 ];then
|
||||||
echo -e "\033[33m文件解压失败!\033[0m"
|
echo -e "\033[33m文件解压失败!\033[0m"
|
||||||
error_down
|
error_down
|
||||||
@@ -1204,7 +1204,7 @@ getscripts(){ #更新脚本文件
|
|||||||
echo -e "\033[32m脚本更新成功!\033[0m"
|
echo -e "\033[32m脚本更新成功!\033[0m"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
rm -rf ${TMPDIR}/update.tar.gz
|
rm -rf ${TMPDIR}/ShellCrash.tar.gz
|
||||||
exit
|
exit
|
||||||
}
|
}
|
||||||
setscripts(){
|
setscripts(){
|
||||||
|
|||||||
Reference in New Issue
Block a user