|
34 | 34 |
|
35 | 35 | 🕹️ Control: |
36 | 36 | clashui 🕹️ 查看 Web 控制台 |
37 | | - secret 🔑 管理 Web 密钥(show / set) |
| 37 | + secret 🔑 查看或设置 Web 密钥 |
38 | 38 | clashsecret 🔑 查看或设置 Web 密钥 |
39 | 39 |
|
40 | 40 | 🩺 Diagnose: |
@@ -3899,7 +3899,7 @@ cmd_mixin_show() { |
3899 | 3899 | else |
3900 | 3900 | cat "$file" |
3901 | 3901 | if mixin_config_has_secret_override "$file"; then |
3902 | | - ui_warn "检测到 override.secret:该字段已忽略,请改用 clashctl secret set" |
| 3902 | + ui_warn "检测到 override.secret:该字段已忽略,请改用 clashctl secret <密钥>" |
3903 | 3903 | fi |
3904 | 3904 | fi |
3905 | 3905 | ui_blank |
@@ -4589,44 +4589,19 @@ cmd_secret() { |
4589 | 4589 |
|
4590 | 4590 | prepare |
4591 | 4591 |
|
4592 | | - case "${1:-}" in |
4593 | | - ""|show) |
4594 | | - [ "$#" -le 1 ] || die_usage "secret show 参数不合法" "clashctl secret show" |
4595 | | - show_controller_secret_from_env |
4596 | | - ;; |
4597 | | - set) |
4598 | | - shift || true |
4599 | | - [ "$#" -le 1 ] || die_usage "secret set 参数不合法" "clashctl secret set [密钥]" |
4600 | | - new_secret="${1:-}" |
4601 | | - [ -n "${new_secret:-}" ] || new_secret="$(generate_secure_secret)" |
4602 | | - set_controller_secret "$new_secret" |
| 4592 | + if [ "$#" -eq 0 ]; then |
| 4593 | + show_controller_secret_from_env |
| 4594 | + return 0 |
| 4595 | + fi |
4603 | 4596 |
|
4604 | | - synced="true" |
4605 | | - sync_runtime_controller_secret_from_env || synced="false" |
4606 | | - print_controller_secret_apply_feedback "$synced" |
4607 | | - ;; |
4608 | | - help|-h|--help) |
4609 | | - echo |
4610 | | - echo "🔑 控制器密钥" |
4611 | | - echo |
4612 | | - echo "用法:" |
4613 | | - echo " clashctl secret show" |
4614 | | - echo " clashctl secret set [密钥]" |
4615 | | - echo |
4616 | | - echo "兼容:" |
4617 | | - echo " clashctl secret [密钥]" |
4618 | | - echo " clashsecret [密钥]" |
4619 | | - echo |
4620 | | - ;; |
4621 | | - *) |
4622 | | - new_secret="$1" |
4623 | | - set_controller_secret "$new_secret" |
| 4597 | + [ "$#" -eq 1 ] || die_usage "secret 参数不合法" "clashctl secret <密钥>" |
4624 | 4598 |
|
4625 | | - synced="true" |
4626 | | - sync_runtime_controller_secret_from_env || synced="false" |
4627 | | - print_controller_secret_apply_feedback "$synced" |
4628 | | - ;; |
4629 | | - esac |
| 4599 | + new_secret="$1" |
| 4600 | + set_controller_secret "$new_secret" |
| 4601 | + |
| 4602 | + synced="true" |
| 4603 | + sync_runtime_controller_secret_from_env || synced="false" |
| 4604 | + print_controller_secret_apply_feedback "$synced" |
4630 | 4605 | } |
4631 | 4606 |
|
4632 | 4607 | cmd_tun_status() { |
|
0 commit comments