From d720b8107db5b7e9852f9c043cdc5a48f99d4ee7 Mon Sep 17 00:00:00 2001 From: cliffmccarthy <16453869+cliffmccarthy@users.noreply.github.com> Date: Mon, 13 Oct 2025 09:37:54 -0500 Subject: [PATCH] Don't print echobot link when disabling mail - On a fresh install, if cmdeploy is run the first time with the --disable-mail option, the echobot invite-link.txt file will not exist yet. - Only print the echobot invite link if --disable-mail was not specified. This fixes the fresh-install error case, and also makes sense when disabling mail in general, because the echo bot will not be available at that time. --- cmdeploy/src/cmdeploy/cmdeploy.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmdeploy/src/cmdeploy/cmdeploy.py b/cmdeploy/src/cmdeploy/cmdeploy.py index 274b6465..737ddc4e 100644 --- a/cmdeploy/src/cmdeploy/cmdeploy.py +++ b/cmdeploy/src/cmdeploy/cmdeploy.py @@ -109,14 +109,15 @@ def run_cmd(args, out): try: retcode = out.check_call(cmd, env=env) if retcode == 0: - print("\nYou can try out the relay by talking to this echo bot: ") - sshexec = SSHExec(args.config.mail_domain, verbose=args.verbose) - print( - sshexec( - call=remote.rshell.shell, - kwargs=dict(command="cat /var/lib/echobot/invite-link.txt"), + if not args.disable_mail: + print("\nYou can try out the relay by talking to this echo bot: ") + sshexec = SSHExec(args.config.mail_domain, verbose=args.verbose) + print( + sshexec( + call=remote.rshell.shell, + kwargs=dict(command="cat /var/lib/echobot/invite-link.txt"), + ) ) - ) out.green("Deploy completed, call `cmdeploy dns` next.") elif not remote_data["acme_account_url"]: out.red("Deploy completed but letsencrypt not configured")