Switch subprocess bullet character

This commit is contained in:
Micah Lee 2021-06-17 11:18:13 -07:00
parent 04dcf72313
commit 9c645beaef
3 changed files with 5 additions and 5 deletions

View file

@ -20,9 +20,9 @@ def exec_container(global_common, args):
output += line.decode()
# Hack to add colors to the command executing
if line.startswith(b"\xe2\x80\xa3 "):
if line.startswith(b"\xc2\xbb "):
print(
Fore.WHITE + "\x10 " + Fore.LIGHTCYAN_EX + line.decode()[2:],
Fore.YELLOW + "\xbb " + Fore.LIGHTCYAN_EX + line.decode()[2:],
end="",
)
else:

View file

@ -25,7 +25,7 @@ def exec_container(args):
args = [container_runtime] + args
args_str = " ".join(pipes.quote(s) for s in args)
print("\x10 " + args_str)
print("\xbb " + args_str)
sys.stdout.flush()
with subprocess.Popen(

View file

@ -450,7 +450,7 @@ class GlobalCommon(object):
# Execute dangerzone-container
args_str = " ".join(pipes.quote(s) for s in args)
print(Fore.YELLOW + "\x10 " + Fore.CYAN + args_str)
print(Fore.YELLOW + "\xbb " + Fore.CYAN + args_str)
return subprocess.Popen(
args,
startupinfo=self.get_subprocess_startupinfo(),
@ -477,7 +477,7 @@ class GlobalCommon(object):
) as p:
stdout_data, _ = p.communicate()
lines = stdout_data.split(b"\n")
if b"\x10 " in lines[0]:
if b"\xbb " in lines[0]:
stdout_data = b"\n".join(lines[1:])
# The user canceled, or permission denied