mirror of
https://github.com/juewuy/ShellCrash.git
synced 2026-03-12 16:31:25 +00:00
Merge branch 'dev' into gateway
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -1,4 +1,4 @@
|
|||||||
meta_v=v1.19.17
|
meta_v=v1.19.17
|
||||||
singboxr_v=1.13.0-alpha.27
|
singboxr_v=1.13.0-alpha.27
|
||||||
versionsh=1.9.3beta5
|
versionsh=1.9.3beta5fix
|
||||||
GeoIP_v=20251205
|
GeoIP_v=20251205
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Copyright (C) Juewuy
|
# Copyright (C) Juewuy
|
||||||
|
|
||||||
version=1.9.3beta5
|
version=1.9.3beta5fix
|
||||||
|
|
||||||
setdir() {
|
setdir() {
|
||||||
dir_avail() {
|
dir_avail() {
|
||||||
|
|||||||
@@ -410,6 +410,7 @@ modify_yaml() { #修饰clash配置文件
|
|||||||
}
|
}
|
||||||
#dns配置
|
#dns配置
|
||||||
[ -z "$(cat "$CRASHDIR"/yamls/user.yaml 2>/dev/null | grep '^dns:')" ] && {
|
[ -z "$(cat "$CRASHDIR"/yamls/user.yaml 2>/dev/null | grep '^dns:')" ] && {
|
||||||
|
[ "$crashcore" != meta ] && dns_resolver='223.5.5.5'
|
||||||
cat >"$TMPDIR"/dns.yaml <<EOF
|
cat >"$TMPDIR"/dns.yaml <<EOF
|
||||||
dns:
|
dns:
|
||||||
enable: true
|
enable: true
|
||||||
|
|||||||
@@ -161,7 +161,6 @@ logger(){
|
|||||||
[ "$task_push" = 1 ] && push= || push=off
|
[ "$task_push" = 1 ] && push= || push=off
|
||||||
[ -n "$2" -a "$2" != 0 ] && echo -e "\033[$2m$1\033[0m"
|
[ -n "$2" -a "$2" != 0 ] && echo -e "\033[$2m$1\033[0m"
|
||||||
[ "$3" = 'off' ] && push=off
|
[ "$3" = 'off' ] && push=off
|
||||||
echo "$1"
|
|
||||||
echo "$1" |grep -qE '(每隔|时每)([1-9]|[1-9][0-9])分钟' && push=off
|
echo "$1" |grep -qE '(每隔|时每)([1-9]|[1-9][0-9])分钟' && push=off
|
||||||
${CRASHDIR}/start.sh logger "$1" 0 "$push"
|
${CRASHDIR}/start.sh logger "$1" 0 "$push"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user