mirror of
https://github.com/juewuy/ShellCrash.git
synced 2026-03-12 16:31:25 +00:00
refactor(setrules): replace recursion with while loop
- Replace recursion with while loop - Add double quote to prevent word splitting - Use grep -q instead of [ -n ... ] for rule match
This commit is contained in:
@@ -8,47 +8,59 @@ YAMLSDIR="$CRASHDIR"/yamls
|
|||||||
JSONSDIR="$CRASHDIR"/jsons
|
JSONSDIR="$CRASHDIR"/jsons
|
||||||
|
|
||||||
# 导入订阅、配置文件相关
|
# 导入订阅、配置文件相关
|
||||||
setrules(){ #自定义规则
|
# 自定义规则
|
||||||
|
setrules() {
|
||||||
|
|
||||||
set_rule_type() {
|
set_rule_type() {
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
echo -e "\033[33m请选择规则类型\033[0m"
|
echo -e "\033[33m请选择规则类型\033[0m"
|
||||||
echo $rule_type | awk -F ' ' '{for(i=1;i<=NF;i++){print i" "$i}}'
|
echo "$rule_type" | awk -F ' ' '{for(i=1;i<=NF;i++){print i" "$i}}'
|
||||||
echo -e " 0 返回上级菜单"
|
echo -e " 0 返回上级菜单"
|
||||||
read -p "请输入对应数字 > " num
|
read -p "请输入对应数字 > " num
|
||||||
case "$num" in
|
case "$num" in
|
||||||
0) ;;
|
"" | 0) ;;
|
||||||
[0-9]*)
|
[0-9]*)
|
||||||
if [ $num -gt $(echo $rule_type | awk -F " " '{print NF}') ];then
|
if [ "$num" -gt $(echo $rule_type | awk -F " " '{print NF}') ]; then
|
||||||
errornum
|
errornum
|
||||||
|
sleep 1
|
||||||
else
|
else
|
||||||
rule_type_set=$(echo $rule_type|cut -d' ' -f$num)
|
rule_type_set=$(echo "$rule_type" | cut -d' ' -f"$num")
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
echo -e "\033[33m请输入规则语句,可以是域名、泛域名、IP网段或者其他匹配规则类型的内容\033[0m"
|
echo -e "\033[33m请输入规则语句,可以是域名、泛域名、IP网段或者其他匹配规则类型的内容\033[0m"
|
||||||
read -p "请输入对应规则 > " rule_state_set
|
read -p "请输入对应规则 > " rule_state_set
|
||||||
[ -n "$rule_state_set" ] && set_group_type || errornum
|
if [ -n "$rule_state_set" ]; then
|
||||||
|
set_group_type
|
||||||
|
else
|
||||||
|
errornum
|
||||||
|
slepp 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
errornum
|
errornum
|
||||||
|
sleep 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
set_group_type() {
|
set_group_type() {
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
echo -e "\033[36m请选择具体规则\033[0m"
|
echo -e "\033[36m请选择具体规则\033[0m"
|
||||||
echo -e "\033[33m此处规则读取自现有配置文件,如果你后续更换配置文件时运行出错,请尝试重新添加\033[0m"
|
echo -e "\033[33m此处规则读取自现有配置文件,如果你后续更换配置文件时运行出错,请尝试重新添加\033[0m"
|
||||||
echo $rule_group | awk -F '#' '{for(i=1;i<=NF;i++){print i" "$i}}'
|
echo "$rule_group" | awk -F '#' '{for(i=1;i<=NF;i++){print i" "$i}}'
|
||||||
echo -e " 0 返回上级菜单"
|
echo -e " 0 返回上级菜单"
|
||||||
read -p "请输入对应数字 > " num
|
read -p "请输入对应数字 > " num
|
||||||
case "$num" in
|
case "$num" in
|
||||||
0) ;;
|
"" | 0) ;;
|
||||||
[0-9]*)
|
[0-9]*)
|
||||||
if [ $num -gt $(echo $rule_group | awk -F "#" '{print NF}') ];then
|
if [ "$num" -gt "$(echo "$rule_group" | awk -F "#" '{print NF}')" ]; then
|
||||||
errornum
|
errornum
|
||||||
|
sleep 1
|
||||||
else
|
else
|
||||||
rule_group_set=$(echo $rule_group|cut -d'#' -f$num)
|
rule_group_set=$(echo "$rule_group" | cut -d'#' -f"$num")
|
||||||
rule_all="- ${rule_type_set},${rule_state_set},${rule_group_set}"
|
rule_all="- ${rule_type_set},${rule_state_set},${rule_group_set}"
|
||||||
[ -n "$(echo IP-CIDR SRC-IP-CIDR IP-CIDR6|grep "$rule_type_set")" ] && rule_all="${rule_all},no-resolve"
|
echo "IP-CIDR SRC-IP-CIDR IP-CIDR6" | grep -q -- "$rule_type_set" && rule_all="${rule_all},no-resolve"
|
||||||
|
|
||||||
echo "$rule_all" >>"$YAMLSDIR"/rules.yaml
|
echo "$rule_all" >>"$YAMLSDIR"/rules.yaml
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
echo -e "\033[32m添加成功!\033[0m"
|
echo -e "\033[32m添加成功!\033[0m"
|
||||||
@@ -56,10 +68,13 @@ setrules(){ #自定义规则
|
|||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
errornum
|
errornum
|
||||||
|
sleep 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
del_rule_type() {
|
del_rule_type() {
|
||||||
|
while true; do
|
||||||
echo -e "输入对应数字即可移除相应规则:"
|
echo -e "输入对应数字即可移除相应规则:"
|
||||||
sed -i '/^ *$/d; /^#/d' "$YAMLSDIR"/rules.yaml
|
sed -i '/^ *$/d; /^#/d' "$YAMLSDIR"/rules.yaml
|
||||||
cat "$YAMLSDIR"/rules.yaml | grep -Ev '^#' | awk -F "#" '{print " "NR" "$1$2$3}'
|
cat "$YAMLSDIR"/rules.yaml | grep -Ev '^#' | awk -F "#" '{print " "NR" "$1$2$3}'
|
||||||
@@ -67,23 +82,29 @@ setrules(){ #自定义规则
|
|||||||
echo -e " 0 返回上级菜单"
|
echo -e " 0 返回上级菜单"
|
||||||
read -p "请输入对应数字 > " num
|
read -p "请输入对应数字 > " num
|
||||||
case "$num" in
|
case "$num" in
|
||||||
0) ;;
|
"" | 0)
|
||||||
'') ;;
|
break
|
||||||
|
;;
|
||||||
*)
|
*)
|
||||||
if [ "$num" -le "$(wc -l <"$YAMLSDIR"/rules.yaml)" ]; then
|
if [ "$num" -le "$(wc -l <"$YAMLSDIR"/rules.yaml)" ]; then
|
||||||
sed -i "${num}d" "$YAMLSDIR"/rules.yaml
|
sed -i "${num}d" "$YAMLSDIR"/rules.yaml
|
||||||
sleep 1
|
sleep 1
|
||||||
del_rule_type
|
|
||||||
else
|
else
|
||||||
errornum
|
errornum
|
||||||
|
sleep 1
|
||||||
|
break
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
get_rule_group() {
|
get_rule_group() {
|
||||||
. "$CRASHDIR"/libs/web_save.sh
|
. "$CRASHDIR"/libs/web_save.sh
|
||||||
get_save http://127.0.0.1:${db_port}/proxies | sed 's/:{/!/g' | awk -F '!' '{for(i=1;i<=NF;i++) print $i}' | grep -aE '"Selector|URLTest|LoadBalance"' | grep -aoE '"name":.*"now":".*",' | awk -F '"' '{print "#"$4}' | tr -d '\n'
|
get_save http://127.0.0.1:${db_port}/proxies | sed 's/:{/!/g' | awk -F '!' '{for(i=1;i<=NF;i++) print $i}' | grep -aE '"Selector|URLTest|LoadBalance"' | grep -aoE '"name":.*"now":".*",' | awk -F '"' '{print "#"$4}' | tr -d '\n'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
while true; do
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
echo -e "\033[33m你可以在这里快捷管理自定义规则\033[0m"
|
echo -e "\033[33m你可以在这里快捷管理自定义规则\033[0m"
|
||||||
echo -e "如需批量操作,请手动编辑:\033[36m $YAMLSDIR/rules.yaml\033[0m"
|
echo -e "如需批量操作,请手动编辑:\033[36m $YAMLSDIR/rules.yaml\033[0m"
|
||||||
@@ -97,13 +118,13 @@ setrules(){ #自定义规则
|
|||||||
echo -e " 0 返回上级菜单"
|
echo -e " 0 返回上级菜单"
|
||||||
read -p "请输入对应数字 > " num
|
read -p "请输入对应数字 > " num
|
||||||
case "$num" in
|
case "$num" in
|
||||||
0)
|
"" | 0)
|
||||||
|
break
|
||||||
;;
|
;;
|
||||||
1)
|
1)
|
||||||
rule_type="DOMAIN-SUFFIX DOMAIN-KEYWORD IP-CIDR SRC-IP-CIDR DST-PORT SRC-PORT GEOIP GEOSITE IP-CIDR6 DOMAIN PROCESS-NAME"
|
rule_type="DOMAIN-SUFFIX DOMAIN-KEYWORD IP-CIDR SRC-IP-CIDR DST-PORT SRC-PORT GEOIP GEOSITE IP-CIDR6 DOMAIN PROCESS-NAME"
|
||||||
rule_group="DIRECT#REJECT$(get_rule_group)"
|
rule_group="DIRECT#REJECT$(get_rule_group)"
|
||||||
set_rule_type
|
set_rule_type
|
||||||
setrules
|
|
||||||
;;
|
;;
|
||||||
2)
|
2)
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
@@ -113,12 +134,10 @@ setrules(){ #自定义规则
|
|||||||
echo -e "请先添加自定义规则!"
|
echo -e "请先添加自定义规则!"
|
||||||
sleep 1
|
sleep 1
|
||||||
fi
|
fi
|
||||||
setrules
|
|
||||||
;;
|
;;
|
||||||
3)
|
3)
|
||||||
read -p "确认清空全部自定义规则?(1/0) > " res
|
read -p "确认清空全部自定义规则?(1/0) > " res
|
||||||
[ "$res" = "1" ] && sed -i '/^\s*[^#]/d' "$YAMLSDIR"/rules.yaml
|
[ "$res" = "1" ] && sed -i '/^\s*[^#]/d' "$YAMLSDIR"/rules.yaml
|
||||||
setrules
|
|
||||||
;;
|
;;
|
||||||
4)
|
4)
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
@@ -130,15 +149,17 @@ setrules(){ #自定义规则
|
|||||||
else
|
else
|
||||||
proxies_bypass=OFF
|
proxies_bypass=OFF
|
||||||
fi
|
fi
|
||||||
setconfig proxies_bypass $proxies_bypass
|
setconfig proxies_bypass "$proxies_bypass"
|
||||||
sleep 1
|
sleep 1
|
||||||
setrules
|
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
errornum
|
errornum
|
||||||
|
sleep 1
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
setgroups(){ #自定义clash策略组
|
setgroups(){ #自定义clash策略组
|
||||||
set_group_type(){
|
set_group_type(){
|
||||||
echo "-----------------------------------------------"
|
echo "-----------------------------------------------"
|
||||||
|
|||||||
Reference in New Issue
Block a user