mirror of
https://github.com/juewuy/ShellCrash.git
synced 2026-03-12 00:11:31 +00:00
~检查更新流程优化
~padavan自启优化 ~部分界面文本优化 ~bug fix
This commit is contained in:
@@ -108,7 +108,8 @@ task_add(){ #任务添加
|
||||
}
|
||||
task_del(){ #任务删除
|
||||
#删除定时任务
|
||||
croncmd -l > "$TMPDIR"/cron && sed -i "/$1/d" "$TMPDIR"/cron && croncmd "$TMPDIR"/cron
|
||||
croncmd -l > "$TMPDIR"/cron
|
||||
sed -i "/$1/d" "$TMPDIR"/cron && croncmd "$TMPDIR"/cron
|
||||
rm -f "$TMPDIR"/cron
|
||||
#删除条件任务
|
||||
sed -i "/$1/d" "$CRASHDIR"/task/cron 2>/dev/null
|
||||
@@ -125,6 +126,9 @@ task_type(){ #任务条件选择菜单
|
||||
echo -e " 2 定时任务\033[32m每日执行\033[0m"
|
||||
echo -e " 3 定时任务\033[32m每小时执行\033[0m"
|
||||
echo -e " 4 定时任务\033[32m每分钟执行\033[0m"
|
||||
echo "-----------------------------------------------"
|
||||
echo -e "\033[31m注意:\033[0m逻辑水平不及格的请勿使用下方触发条件!"
|
||||
echo "-----------------------------------------------"
|
||||
echo -e " 5 服务\033[33m启动前执行\033[0m"
|
||||
echo -e " 6 服务\033[33m启动后执行\033[0m"
|
||||
echo -e " 7 服务\033[33m运行时每分钟执行\033[0m"
|
||||
|
||||
@@ -18,8 +18,7 @@ error_down(){
|
||||
upgrade() {
|
||||
while true; do
|
||||
echo "-----------------------------------------------"
|
||||
echo -ne "\033[32m正在检查更新!\033[0m\r"
|
||||
checkupdate
|
||||
[ -z "$version_new" ] && checkupdate
|
||||
[ -z "$core_v" ] && core_v=$crashcore
|
||||
core_v_new=$(eval echo \$"$crashcore"_v)
|
||||
echo -e "\033[30;47m欢迎使用更新功能:\033[0m"
|
||||
@@ -107,6 +106,7 @@ upgrade() {
|
||||
|
||||
#检查更新
|
||||
checkupdate(){
|
||||
echo -ne "\033[32m正在检查更新!\033[0m\r"
|
||||
get_bin "$TMPDIR"/version_new version echooff
|
||||
[ "$?" = "0" ] && {
|
||||
version_new=$(cat "$TMPDIR"/version_new)
|
||||
@@ -641,9 +641,9 @@ setgeo() {
|
||||
echo "-----------------------------------------------"
|
||||
echo -e " 3 Mihomo精简版GeoIP_cn数据库(约0.1mb) \033[33m$cn_mini_v\033[0m"
|
||||
echo -e " 4 Mihomo完整版GeoSite数据库(约5mb) \033[33m$geosite_v\033[0m"
|
||||
echo -e " 5 Mihomo-mrs数据库常用包(约1mb) \033[33m$mrs_v\033[0m"
|
||||
echo "-----------------------------------------------"
|
||||
echo -e " 6 Singbox-srs数据库常用包(约0.8mb) \033[33m$srs_v\033[0m"
|
||||
echo -e " 5 Mihomo-mrs数据库常用包(约1mb,非必要勿用)"
|
||||
echo -e " 6 Singbox-srs数据库常用包(约0.8mb,非必要勿用)"
|
||||
echo "-----------------------------------------------"
|
||||
echo -e " 8 \033[32m自定义数据库文件\033[0m"
|
||||
echo -e " 9 \033[31m清理数据库文件\033[0m"
|
||||
@@ -917,6 +917,7 @@ saveserver() {
|
||||
setconfig update_url "'$update_url'"
|
||||
setconfig url_id $url_id
|
||||
setconfig release_type $release_type
|
||||
version_new=''
|
||||
echo "-----------------------------------------------"
|
||||
echo -e "\033[32m源地址切换成功!\033[0m"
|
||||
}
|
||||
@@ -960,11 +961,13 @@ setserver() {
|
||||
elif [ "$url_id_new" -ge 200 ];then
|
||||
update_url=$(grep -E "^1|$release_name" "$CRASHDIR"/configs/servers.list | sed -n ""$num"p" | awk '{print $3}')
|
||||
url_id=''
|
||||
continue
|
||||
saveserver
|
||||
break
|
||||
else
|
||||
url_id=$url_id_new
|
||||
update_url=''
|
||||
continue
|
||||
saveserver
|
||||
break
|
||||
fi
|
||||
unset url_id_new
|
||||
;;
|
||||
|
||||
Reference in New Issue
Block a user