From 8bbc26ca593e4dbf5b3eca01837a01c2509f1432 Mon Sep 17 00:00:00 2001 From: Anton Hvornum Date: Wed, 2 Jun 2021 00:21:15 +0200 Subject: Attempt to fix issue regarding broken output Since pacman and some other commands these days write multiple lines and goes back and fourth, it's not reliable to say the "peaked" line is a single line. And if it's not, it will make the output look like garbage. So instead, we'll write any output - as is - and let the command deal with fancy printing. --- archinstall/lib/general.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/archinstall/lib/general.py b/archinstall/lib/general.py index 3b62c891..9711382f 100644 --- a/archinstall/lib/general.py +++ b/archinstall/lib/general.py @@ -202,27 +202,6 @@ class SysCommandWorker: except UnicodeDecodeError: return False - output = output.strip('\r\n ') - if len(output) <= 0: - return False - - from .user_interaction import get_terminal_width - - # Move back to the beginning of the terminal - sys.stdout.flush() - sys.stdout.write("\033[%dG" % 0) - sys.stdout.flush() - - # Clear the line - sys.stdout.write(" " * get_terminal_width()) - sys.stdout.flush() - - # Move back to the beginning again - sys.stdout.flush() - sys.stdout.write("\033[%dG" % 0) - sys.stdout.flush() - - # And print the new output we're peaking on: sys.stdout.write(output) sys.stdout.flush() return True -- cgit v1.2.3-54-g00ecf