mathieu/HA-EasyComputerManager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 10 Wiki Activity

fix strip error on CommandOutput and fix desktop env detect. linux

Browse Source
This commit is contained in:
Mathieu Broillet 2024-08-26 20:51:33 +02:00
parent af870c63eb
commit 8f2f03f134
Signed by: mathieu
GPG Key ID: A08E484FE95074C1
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
custom_components/easy_computer_manager/computer/common.py
View File

@ -11,8 +11,8 @@ class CommandOutput:
def __init__(self, command: str, return_code: int, output: str, error: str) -> None: def __init__(self, command: str, return_code: int, output: str, error: str) -> None:
self.command = command self.command = command
self.return_code = return_code self.return_code = return_code
self.output = output self.output = output.strip()
self.error = error self.error = error.strip()
def successful(self) -> bool: def successful(self) -> bool:
return self.return_code == 0 return self.return_code == 0

3
custom_components/easy_computer_manager/const.py
View File

@ -22,8 +22,7 @@ ACTIONS = {
"linux": ["awk -F'=' '/^NAME=|^VERSION=/{gsub(/\"/, \"\", $2); printf $2\" \"}\' /etc/os-release && echo", "lsb_release -a | awk '/Description/ {print $2, $3, $4}'"] "linux": ["awk -F'=' '/^NAME=|^VERSION=/{gsub(/\"/, \"\", $2); printf $2\" \"}\' /etc/os-release && echo", "lsb_release -a | awk '/Description/ {print $2, $3, $4}'"]
}, },
"desktop_environment": { "desktop_environment": {
"linux": [ "linux": ["for session in $(ls /usr/bin/*session 2>/dev/null); do basename $session | sed 's/-session//'; done | grep -E 'gnome|kde|xfce|mate|lxde|cinnamon|budgie|unity' | head -n 1"],
"echo \"${XDG_CURRENT_DESKTOP:-${DESKTOP_SESSION:-$(basename $(grep -Eo \'exec .*(startx|xinitrc)\' ~/.xsession 2>/dev/null | awk \'{print $2}\'))}}\""],
"windows": ["echo Windows"] "windows": ["echo Windows"]
}, },
"shutdown": { "shutdown": {