yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

prompt/multiline: strip final newline just like hidden prompt

Browse Source
This commit is contained in:
Jörg Thalheim
2025-08-26 13:25:55 +02:00
parent 5bfa0d7a9d
commit 7330285150
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/clan-cli/clan_cli/vars/prompt.py
View File

@@ -129,7 +129,10 @@ def _get_secret_input_with_confirmation(
remaining = max_attempts - attempt - 1 remaining = max_attempts - attempt - 1
if remaining > 0: if remaining > 0:
attempts_text = "attempt" if remaining == 1 else "attempts" attempts_text = "attempt" if remaining == 1 else "attempts"
print(f"Values do not match. {remaining} {attempts_text} remaining.") print(
f"Values do not match. {remaining} {attempts_text} remaining.",
file=sys.stderr,
)
else: else:
msg = f"Failed to confirm value for {ident} after {max_attempts} attempts." msg = f"Failed to confirm value for {ident} after {max_attempts} attempts."
raise ClanError(msg) raise ClanError(msg)
@@ -171,7 +174,9 @@ def _get_regular_input(input_type: PromptType, text: str) -> str:
return input(f"{text}: ") return input(f"{text}: ")
case PromptType.MULTILINE: case PromptType.MULTILINE:
print(f"{text} (Finish with Ctrl-D): ") print(f"{text} (Finish with Ctrl-D): ")
return sys.stdin.read() content = sys.stdin.read()
# Remove final newline if present to match hidden multi-line behavior
return content.rstrip("\n")
case _: case _:
msg = f"Unsupported input type: {input_type}" msg = f"Unsupported input type: {input_type}"
raise ClanError(msg) raise ClanError(msg)