|
|
|
@ -83,4 +83,29 @@ class fillVars():
|
|
|
|
|
ret = "on"
|
|
|
|
|
return ret
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_cl_desktop_xsession(self):
|
|
|
|
|
"""Current session"""
|
|
|
|
|
envXsessionFile = "/etc/env.d/90xsession"
|
|
|
|
|
xsession = os.environ.get("XSESSION",None)
|
|
|
|
|
desktopSession = os.environ.get("DESKTOP_SESSION",None)
|
|
|
|
|
if not xsession:
|
|
|
|
|
if os.path.exists(envXsessionFile):
|
|
|
|
|
xsession = \
|
|
|
|
|
map(lambda x:x.partition("=")[2].strip("'\""),
|
|
|
|
|
filter(lambda x:x.startswith("XSESSION="),
|
|
|
|
|
filter(lambda x:not x.startswith("#"),
|
|
|
|
|
open(envXsessionFile,"r"))))
|
|
|
|
|
if xsession:
|
|
|
|
|
xsession = xsession[-1]
|
|
|
|
|
if xsession:
|
|
|
|
|
if desktopSession and desktopSession.lower() != "default":
|
|
|
|
|
xsession = desktopSession
|
|
|
|
|
if "kde" in xsession.lower():
|
|
|
|
|
return "kde"
|
|
|
|
|
elif "gnome" in xsession.lower():
|
|
|
|
|
return "gnome"
|
|
|
|
|
elif "xfce" in xsession.lower():
|
|
|
|
|
return "xfce"
|
|
|
|
|
else:
|
|
|
|
|
return xsession.lower()
|
|
|
|
|
return ""
|
|
|
|
|