l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules/shell] Fix missing trim of output string

Browse source 
Remove starting/trailing whitespaces, \n etc.

fixes #592
This commit is contained in:
tobi-wan-kenobi 2020-04-06 08:23:17 +02:00
parent 23215303ca
commit f32affa563
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/contrib/shell.py
View file

@ -37,7 +37,7 @@ class Module(core.module.Module):
def __init__(self, config): def __init__(self, config):
super().__init__(config, core.widget.Widget(self.get_output)) super().__init__(config, core.widget.Widget(self.get_output))
self.__command = self.parameter('command') self.__command = self.parameter('command', 'echo "no command configured"')
self.__async = util.format.asbool(self.parameter('async')) self.__async = util.format.asbool(self.parameter('async'))
if self.__async: if self.__async:
@ -57,7 +57,7 @@ class Module(core.module.Module):
def update(self): def update(self):
# if requested then run not async version and just execute command in this thread # if requested then run not async version and just execute command in this thread
if not self.__async: if not self.__async:
self.__output = util.cli.execute(self.__command, ignore_errors=True) self.__output = util.cli.execute(self.__command, ignore_errors=True).strip()
return return
# if previous thread didn't end yet then don't do anything # if previous thread didn't end yet then don't do anything
@ -71,4 +71,8 @@ class Module(core.module.Module):
) )
self.__current_thread.start() self.__current_thread.start()
def state(self, _):
if self.__output == 'no command configured':
return 'warning'
# vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4 # vim: tabstop=4 expandtab shiftwidth=4 softtabstop=4