Merge branch 'ent-12415-anadir-encoding-utf8-quickshell-wrapper' into 'develop'

12415 adding utf8 encoding

See merge request artica/pandorafms!6632
This commit is contained in:
Rafael Ameijeiras 2023-11-06 15:49:20 +00:00
commit 68df533129
3 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
Source: pandora_gotty Source: pandora_gotty
Section: utils Section: utils
Version: 1.0.0 Version: 1.1.0
Priority: optional Priority: optional
Maintainer: PandoraFMS Maintainer: PandoraFMS
Build-Depends: debhelper (>= 12) Build-Depends: debhelper (>= 12)

View File

@ -1,5 +1,5 @@
%define name pandora_gotty %define name pandora_gotty
%define version 1.0 %define version 1.1
%define release 1%{?dist} %define release 1%{?dist}
Summary: pandora_gptty for Pandora FMS Summary: pandora_gptty for Pandora FMS
Name: %{name} Name: %{name}

View File

@ -74,7 +74,7 @@ def exec_ssh (user:str, add:str, port:int):
try: try:
print("> Starting SSH connection...") print("> Starting SSH connection...")
ssh_command = f"ssh {user}@{add} -p {port}" ssh_command = f"ssh {user}@{add} -p {port}"
subprocess.run(ssh_command, shell=True) subprocess.run(ssh_command, shell=True, encoding='utf-8', text=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise SystemExit(e) raise SystemExit(e)
@ -88,7 +88,7 @@ def exec_telnet (add:str, port:int):
try: try:
print("> Starting Telnet connection...") print("> Starting Telnet connection...")
ssh_command = f"telnet -E {add} {port}" ssh_command = f"telnet -E {add} {port}"
subprocess.run(ssh_command, shell=True) subprocess.run(ssh_command, shell=True, encoding='utf-8', text=True)
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
raise SystemExit(e) raise SystemExit(e)