重构代码, 将工具函数文件导入语句放在代码文件头部

This commit is contained in:
Olia Lisa 2026-01-14 23:04:50 +08:00
parent c8e1f27320
commit 8d96dab146
6 changed files with 13 additions and 15 deletions

View File

@ -1,4 +1,6 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$0")/utils/base.sh"
create_config_with_tls_cert() { create_config_with_tls_cert() {
local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"

View File

@ -1,4 +1,6 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$0")/utils/jq_util.sh"
# 生成自签名证书 # 生成自签名证书
gen_self_tls() { gen_self_tls() {
@ -6,9 +8,6 @@ gen_self_tls() {
local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
local key_dir="$script_dir/../tls/self-tls" local key_dir="$script_dir/../tls/self-tls"
# 导入utils文件夹中的jq_util.sh脚本
source "$script_dir/utils/jq_util.sh"
# 生成自签名证书 # 生成自签名证书
mkdir -p "$key_dir" mkdir -p "$key_dir"
openssl req -x509 -nodes -newkey ec:<(openssl ecparam -name prime256v1) \ openssl req -x509 -nodes -newkey ec:<(openssl ecparam -name prime256v1) \

View File

@ -1,10 +1,11 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$0")/utils/base.sh"
print_share_link() { print_share_link() {
local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
local config_dir=$(readlink -f "$script_dir/../config") local config_dir=$(readlink -f "$script_dir/../config")
local config_file="$config_dir/config.json" local config_file="$config_dir/config.json"
source "${script_dir}/utils/base.sh"
# 检查jq是否安装 # 检查jq是否安装
check_jq check_jq

View File

@ -1,10 +1,11 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$0")/utils/base.sh"
source "$(dirname "$0")/utils/jq_util.sh"
# 修改域名 # 修改域名
update_domain(){ update_domain(){
local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径
source "$script_dir/utils/jq_util.sh"
source "$script_dir/utils/base.sh"
local config_file="$script_dir/../config/config.json" local config_file="$script_dir/../config/config.json"
# 检查jq是否安装 # 检查jq是否安装
@ -32,5 +33,4 @@ update_domain(){
} }
update_domain update_domain

View File

@ -1,14 +1,12 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$0")/utils/base.sh"
source "$(dirname "$0")/utils/jq_util.sh"
# 更新密码的函数 # 更新密码的函数
update_obfs_password() { update_obfs_password() {
local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
local config_file="$script_dir/../config/config.json" local config_file="$script_dir/../config/config.json"
# 加载工具脚本
source "$script_dir/utils/jq_util.sh"
source "$script_dir/utils/base.sh"
# 检查jq是否安装 # 检查jq是否安装
check_jq check_jq

View File

@ -1,14 +1,12 @@
#!/bin/bash #!/bin/bash
source "$(dirname "$0")/utils/base.sh"
source "$(dirname "$0")/utils/jq_util.sh"
# 更新密码的函数 # 更新密码的函数
update_password() { update_password() {
local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
local config_file="$script_dir/../config/config.json" local config_file="$script_dir/../config/config.json"
# 加载工具脚本
source "$script_dir/utils/jq_util.sh"
source "$script_dir/utils/base.sh"
# 检查jq是否安装 # 检查jq是否安装
check_jq check_jq