mirror of
https://github.com/juewuy/ShellCrash.git
synced 2026-03-12 00:11:31 +00:00
Merge pull request #1097 from sofia-riese/patch-6
fix: solve recursion problem and improve the execution logic order
This commit is contained in:
@@ -109,8 +109,8 @@ ckstatus() { #脚本启动前检查
|
|||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
#检查新手引导
|
#检查新手引导
|
||||||
if [ -z "$userguide" ]; then
|
if [ -z "$userguide" ]; then
|
||||||
|
. "$CRASHDIR"/menus/userguide.sh && userguide
|
||||||
setconfig userguide 1
|
setconfig userguide 1
|
||||||
. "$CRASHDIR"/menus/userguide.sh && userguide
|
|
||||||
fi
|
fi
|
||||||
#检查执行权限
|
#检查执行权限
|
||||||
[ ! -x "$CRASHDIR"/start.sh ] && chmod +x "$CRASHDIR"/start.sh
|
[ ! -x "$CRASHDIR"/start.sh ] && chmod +x "$CRASHDIR"/start.sh
|
||||||
|
|||||||
@@ -123,5 +123,5 @@ userguide(){
|
|||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
read -p "立即启动服务?(1/0) > " res
|
read -p "立即启动服务?(1/0) > " res
|
||||||
[ "$res" = 1 ] && start_core && sleep 2
|
[ "$res" = 1 ] && start_core && sleep 2
|
||||||
main_menu
|
return 0
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user