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 pull request #697 from mphin/dev

Browse Source 
修复部分返回上级菜单错误的提示
This commit is contained in:
juewuy 2024-07-03 08:10:21 +08:00 committed by GitHub
commit 58bc356628
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/menu.sh
View File

@ -682,6 +682,8 @@ setipv6(){ #ipv6设置
echo -----------------------------------------------
read -p "请输入对应数字 > " num
case $num in
0)
;;
1)
if [ "$ipv6_redir" = "未开启" ]; then
ipv6_support=已开启
@ -959,6 +961,8 @@ setboot(){ #启动相关设置
read -p "请输入对应数字 > " num
echo -----------------------------------------------
case "$num" in
0)
;;
1)
if [ "$autostart" = "enable" ]; then
[ -d /etc/rc.d ] && cd /etc/rc.d && rm -rf *shellcrash > /dev/null 2>&1 && cd - >/dev/null
@ -1511,6 +1515,8 @@ advanced_set(){ #进阶设置
echo -----------------------------------------------
read -p "请输入对应数字 > " num
case "$num" in
0)
;;
3)
setfirewall
advanced_set

12
scripts/update.sh
View File

@ -98,6 +98,8 @@ setrules(){ #自定义规则
echo -e " 0 返回上级菜单"
read -p "请输入对应数字 > " num
case $num in
0)
;;
1)
rule_type="DOMAIN-SUFFIX DOMAIN-KEYWORD IP-CIDR SRC-IP-CIDR DST-PORT SRC-PORT GEOIP GEOSITE IP-CIDR6 DOMAIN"
rule_group="DIRECT#REJECT$(cat $YAMLSDIR/proxy-groups.yaml $YAMLSDIR/config.yaml 2>/dev/null | grep -Ev '^#' | grep -o '\- name:.*' | sed 's/- name: /#/g' | tr -d '\n')"
@ -208,6 +210,8 @@ EOF
echo -e " 0 返回上级菜单"
read -p "请输入对应数字 > " num
case $num in
0)
;;
1)
group_type="select url-test fallback load-balance"
group_type_cn="手动选择 自动选择 故障转移 负载均衡"
@ -284,6 +288,8 @@ setproxies(){ #自定义clash节点
echo -e " 0 返回上级菜单"
read -p "请输入对应数字 > " num
case $num in
0)
;;
1)
proxy_type="DOMAIN-SUFFIX DOMAIN-KEYWORD IP-CIDR SRC-IP-CIDR DST-PORT SRC-PORT GEOIP GEOSITE IP-CIDR6 DOMAIN MATCH"
proxy_group="$(cat $YAMLSDIR/proxy-groups.yaml $YAMLSDIR/config.yaml 2>/dev/null | sed "/#自定义策略组开始/,/#自定义策略组结束/d" | grep -Ev '^#' | grep -o '\- name:.*' | sed 's/#.*//' | sed 's/- name: /#/g' | tr -d '\n' | sed 's/#//')"
@ -743,6 +749,8 @@ override(){ #配置文件覆写
[ "$inuserguide" = 1 ] || echo -e " 0 返回上级菜单"
read -p "请输入对应数字 > " num
case "$num" in
0)
;;
1)
if [ -n "$(pidof CrashCore)" ];then
echo -----------------------------------------------
@ -1025,6 +1033,8 @@ set_core_config(){ #配置文件功能
[ "$inuserguide" = 1 ] || echo -e " 0 返回上级菜单"
read -p "请输入对应数字 > " num
case "$num" in
0)
;;
1)
if [ -n "$Url" ];then
echo -----------------------------------------------
@ -1483,6 +1493,8 @@ setcore(){ #内核选择菜单
echo 0 返回上级菜单
read -p "请输入对应数字 > " num
case "$num" in
0)
;;
1)
crashcore=clash
custcorelink=''