[~] Refactor
This commit is contained in:
parent
64fdde31e4
commit
652535b31d
@ -1,4 +1,5 @@
|
|||||||
#!/usr/bin/python3
|
#!/usr/bin/python3
|
||||||
|
import os
|
||||||
import json
|
import json
|
||||||
import traceback
|
import traceback
|
||||||
import time
|
import time
|
||||||
@ -509,20 +510,31 @@ try:
|
|||||||
ethernet_device=sys.argv[3],
|
ethernet_device=sys.argv[3],
|
||||||
)
|
)
|
||||||
elif sys.argv[1] == 'desktop-services':
|
elif sys.argv[1] == 'desktop-services':
|
||||||
t1 = []
|
assert all([
|
||||||
|
env_name in os.environ
|
||||||
|
for env_name in [
|
||||||
|
'GTK_IM_MODULE',
|
||||||
|
'XMODIFIERS',
|
||||||
|
'QT_IM_MODULE',
|
||||||
|
'I3SOCK',
|
||||||
|
'SWAYSOCK',
|
||||||
|
'WAYLAND_DISPLAY',
|
||||||
|
]
|
||||||
|
])
|
||||||
|
services = []
|
||||||
try:
|
try:
|
||||||
t1.append(
|
services.append(
|
||||||
subprocess.Popen(['ibus-daemon'])
|
subprocess.Popen(['ibus-daemon'])
|
||||||
)
|
)
|
||||||
for o in t1:
|
for o in services:
|
||||||
t1.wait()
|
o.wait()
|
||||||
finally:
|
finally:
|
||||||
for o in t1:
|
for o in services:
|
||||||
try:
|
try:
|
||||||
t1.terminate(timeout=10)
|
o.terminate(timeout=10)
|
||||||
except:
|
except:
|
||||||
logging.error('killed %s' % str(t1.__dict__))
|
logging.error('killed %s' % str(o.__dict__))
|
||||||
t1.kill()
|
o.kill()
|
||||||
|
|
||||||
else:
|
else:
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
Loading…
Reference in New Issue
Block a user