修复 config 引入顺序

This commit is contained in:
whyour 2024-07-22 23:29:08 +08:00
parent e694570f1a
commit 162bd9d8cc
4 changed files with 3 additions and 6 deletions

View File

@ -5,6 +5,7 @@ dir_shell=/ql/shell
. $dir_shell/env.sh . $dir_shell/env.sh
echo -e "======================1. 检测配置文件========================\n" echo -e "======================1. 检测配置文件========================\n"
import_config "$@"
make_dir /etc/nginx/conf.d make_dir /etc/nginx/conf.d
make_dir /run/nginx make_dir /run/nginx
init_nginx init_nginx

View File

@ -91,10 +91,6 @@ import_config() {
else else
default_cron="$(random_range 0 59) $(random_range 0 23) * * *" default_cron="$(random_range 0 59) $(random_range 0 23) * * *"
fi fi
cpu_warn=${CpuWarn}
mem_warn=${MemoryWarn}
disk_warn=${DiskWarn}
} }
set_proxy() { set_proxy() {
@ -488,5 +484,3 @@ init_env
detect_termux detect_termux
detect_macos detect_macos
define_cmd define_cmd
import_config $1

View File

@ -113,6 +113,7 @@ init_begin_time() {
begin_timestamp=$(format_timestamp "$time_format" "$time") begin_timestamp=$(format_timestamp "$time_format" "$time")
} }
import_config "$@"
while getopts ":lm:" opt; do while getopts ":lm:" opt; do
case $opt in case $opt in
l) l)

View File

@ -563,6 +563,7 @@ main() {
fi fi
} }
import_config "$@"
main "$@" main "$@"
exit 0 exit 0