diff --git a/bin/create_config_hysteria.sh b/bin/create_config_hysteria.sh index e46f788..2737778 100644 --- a/bin/create_config_hysteria.sh +++ b/bin/create_config_hysteria.sh @@ -38,10 +38,10 @@ create_hysteria_self_tls_config() { update_port # 设置密码 - update_password + update_password "$CONFIG_FILE" # 设置混淆密码 - update_obfs_password + update_obfs_password "$CONFIG_FILE" green "成功创建配置" } @@ -58,10 +58,10 @@ create_hysteria_acme_tls_config() { update_port # 设置密码 - update_password + update_password "$CONFIG_FILE" # 设置混淆密码 - update_obfs_password + update_obfs_password "$CONFIG_FILE" green "成功创建配置" } diff --git a/bin/create_config_tuic.sh b/bin/create_config_tuic.sh index 851bb64..d83fe2b 100644 --- a/bin/create_config_tuic.sh +++ b/bin/create_config_tuic.sh @@ -38,7 +38,7 @@ create_tuic_acme_tls_config() { update_port # 设置密码 - update_password + update_password "$CONFIG_FILE" # 设置UUID update_uuid @@ -59,7 +59,7 @@ create_tuic_self_tls_config() { update_port # 设置密码 - update_password + update_password "$CONFIG_FILE" # 设置UUID update_uuid diff --git a/bin/password.sh b/bin/password.sh index f58886a..bdad227 100644 --- a/bin/password.sh +++ b/bin/password.sh @@ -2,30 +2,38 @@ # 更新密码的函数 update_password() { - local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 - local CONFIG_FILE="$SCRIPT_DIR/../config/config.json" - - + local CONFIG_FILE="${1}" + + if [[ -z "$CONFIG_FILE" ]]; then + echo "[Error] config_file配置文件路径 不能为空" + return 1 + fi + # 生成一个长度为16的随机密码 - local NEW_PASSWORD=$(gen_password 16) - + local NEW_PASSWORD + NEW_PASSWORD=$(gen_password 16) + # 修改密码 - sed -i 's/你的密码/'"$NEW_PASSWORD"'/g' $CONFIG_FILE - + sed -i 's/你的密码/'"$NEW_PASSWORD"'/g' "$CONFIG_FILE" + echo "设置密码成功" } # 更新混淆密码 update_obfs_password() { - local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" # 脚本文件夹绝对路径 - local CONFIG_FILE="$SCRIPT_DIR/../config/config.json" - - + local CONFIG_FILE="${1}" + + if [[ -z "$CONFIG_FILE" ]]; then + echo "[Error] config_file配置文件路径 不能为空" + return 1 + fi + # 生成一个长度为16的随机密码 - local NEW_PASSWORD=$(gen_password 16) - + local NEW_PASSWORD + NEW_PASSWORD=$(gen_password 16) + # 修改密码 - sed -i 's/你的混淆密码/'"$NEW_PASSWORD"'/g' $CONFIG_FILE - + sed -i 's/你的混淆密码/'"$NEW_PASSWORD"'/g' "$CONFIG_FILE" + echo "设置密码成功" }