From c70f6a83abf4695583fe0c06d25cfdc53de720d1 Mon Sep 17 00:00:00 2001 From: Olia Lisa Date: Fri, 2 Jan 2026 22:57:05 +0800 Subject: [PATCH] =?UTF-8?q?update,=20=E4=BF=AE=E6=94=B9=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=E5=8F=98=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/create_config.sh | 8 +++++--- bin/gen_self_tls.sh | 4 ++-- bin/print_share_link.sh | 2 +- bin/run.sh | 3 ++- bin/update_docker_images.sh | 2 +- bin/update_password.sh | 4 ++-- bin/update_port.sh | 3 ++- bin/update_uuid.sh | 2 +- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/bin/create_config.sh b/bin/create_config.sh index fc6f983..d96896e 100644 --- a/bin/create_config.sh +++ b/bin/create_config.sh @@ -1,7 +1,7 @@ #!/bin/bash create_config_with_tls_cert() { - local script_dir=$(cd "$(dirname "$0")"; pwd) + local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 local config_file="$script_dir/../config/config.json" cp "$script_dir/../config/template/tls_cert_config.json" "$config_file" @@ -44,7 +44,8 @@ create_config_with_tls_cert() { } create_self_tls_config() { - local script_dir=$(cd "$(dirname "$0")"; pwd) + local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 + cp "$script_dir/../config/template/self_cert_config.json" "$script_dir/../config/config.json" @@ -64,7 +65,8 @@ create_self_tls_config() { } create_config(){ - local script_dir=$(cd "$(dirname "$0")"; pwd) + local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 + local config_file="$script_dir/../config/config.json" diff --git a/bin/gen_self_tls.sh b/bin/gen_self_tls.sh index ae9feb5..4ccdde1 100644 --- a/bin/gen_self_tls.sh +++ b/bin/gen_self_tls.sh @@ -3,7 +3,7 @@ # 生成自签名证书 gen_self_tls() { local domain="${1:-bing.com}" - local script_dir="$(dirname "$(realpath "$0")")" + local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 local key_dir="$script_dir/../tls/self-tls" local config_file="$script_dir/../config/config.json" @@ -25,4 +25,4 @@ gen_self_tls() { } # 调用函数,传入第一个参数作为域名 -gen_self_tls "${1:-bing.com}" \ No newline at end of file +gen_self_tls "${1:-bing.com}" diff --git a/bin/print_share_link.sh b/bin/print_share_link.sh index 80a87dd..47bc26f 100644 --- a/bin/print_share_link.sh +++ b/bin/print_share_link.sh @@ -1,7 +1,7 @@ #!/bin/bash print_share_link() { - local script_dir=$(cd "$(dirname "$0")"; pwd) + local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 local config_dir=$(readlink -f "$script_dir/../config") source "${script_dir}/utils/base.sh" diff --git a/bin/run.sh b/bin/run.sh index e27e79b..cf4ba7c 100644 --- a/bin/run.sh +++ b/bin/run.sh @@ -2,7 +2,8 @@ run() { - local script_dir=$(cd "$(dirname "$0")"; pwd) + local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 + local config_dir=$(readlink -f "$script_dir/../config") source "$script_dir/utils/base.sh" diff --git a/bin/update_docker_images.sh b/bin/update_docker_images.sh index 7cbdb9d..d0bb342 100644 --- a/bin/update_docker_images.sh +++ b/bin/update_docker_images.sh @@ -2,7 +2,7 @@ update_docker_images(){ - script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径 + local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 docker_compose_file="$script_dir/../docker-compose.yml" # docker-compose.yml文件路径 # 检查是否存在 docker-compose.yml 文件 diff --git a/bin/update_password.sh b/bin/update_password.sh index 10b163c..2664b55 100644 --- a/bin/update_password.sh +++ b/bin/update_password.sh @@ -2,7 +2,7 @@ # 更新密码的函数 update_password() { - local script_dir="$(dirname "$(realpath "$0")")" + local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 local config_file="$script_dir/../config/config.json" # 加载工具脚本 @@ -18,4 +18,4 @@ update_password() { } # 调用函数 -update_password \ No newline at end of file +update_password diff --git a/bin/update_port.sh b/bin/update_port.sh index 05f3863..a3da481 100644 --- a/bin/update_port.sh +++ b/bin/update_port.sh @@ -45,7 +45,8 @@ find_free_port() { } update_port(){ - local script_dir=$(cd "$(dirname "$0")"; pwd) + local script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 + local config_dir="$script_dir/../config" source "$script_dir/utils/jq_util.sh" diff --git a/bin/update_uuid.sh b/bin/update_uuid.sh index 733a107..d52307b 100644 --- a/bin/update_uuid.sh +++ b/bin/update_uuid.sh @@ -2,7 +2,7 @@ update_uuid(){ - script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件绝对路径 + script_dir=$(cd "$(dirname "$0")"; pwd) # 脚本文件夹绝对路径 config_dir="$script_dir/../config" # 生成 UUID