From 9972f0f89b152f1eb10fc524ba816290617ccdb5 Mon Sep 17 00:00:00 2001 From: ReturnFI <151555003+ReturnFI@users.noreply.github.com> Date: Sun, 14 Dec 2025 20:41:38 +0000 Subject: [PATCH] fix(cli): update install_hysteria2 to return output message --- core/cli.py | 4 ++-- core/cli_api.py | 4 ++-- core/scripts/hysteria2/install.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/cli.py b/core/cli.py index 0c419ee..e52cc16 100644 --- a/core/cli.py +++ b/core/cli.py @@ -26,8 +26,8 @@ def cli(): @click.option('--sni', '-s', required=False, default='bts.com', help='SNI for Hysteria2 (default: bts.com)', type=str) def install_hysteria2(port: int, sni: str): try: - cli_api.install_hysteria2(port, sni) - click.echo(f'Hysteria2 installed successfully on port {port} with SNI {sni}.') + output = cli_api.install_hysteria2(port, sni) + click.echo(output) except Exception as e: click.echo(f'{e}', err=True) diff --git a/core/cli_api.py b/core/cli_api.py index 71583b1..0346dea 100644 --- a/core/cli_api.py +++ b/core/cli_api.py @@ -138,11 +138,11 @@ def generate_password() -> str: # region Hysteria -def install_hysteria2(port: int, sni: str): +def install_hysteria2(port: int, sni: str) -> str: ''' Installs Hysteria2 on the given port and uses the provided or default SNI value. ''' - run_cmd(['bash', Command.INSTALL_HYSTERIA2.value, str(port), sni]) + return run_cmd(['bash', Command.INSTALL_HYSTERIA2.value, str(port), sni]) def uninstall_hysteria2(): diff --git a/core/scripts/hysteria2/install.sh b/core/scripts/hysteria2/install.sh index ff4f26a..ebf66ac 100644 --- a/core/scripts/hysteria2/install.sh +++ b/core/scripts/hysteria2/install.sh @@ -21,7 +21,7 @@ install_hysteria() { wget -O /etc/hysteria/geosite.dat https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geosite.dat >/dev/null 2>&1 wget -O /etc/hysteria/geoip.dat https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/release/geoip.dat >/dev/null 2>&1 - echo "Generating base64 encoded SHA-256 fingerprint..." + echo "Generating SHA-256 fingerprint..." sha256=$(openssl x509 -noout -fingerprint -sha256 -inform pem -in ca.crt | sed 's/.*=//;s///g')