[oe-commits] Joshua Lock : lib/oe/terminal: add support for XFCE's terminal emulator
git at git.openembedded.org
git at git.openembedded.org
Tue Nov 1 17:45:55 UTC 2011
Module: openembedded-core.git
Branch: master-next
Commit: 162b70a36388ac44fc1b39e172cd53579707bff3
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=162b70a36388ac44fc1b39e172cd53579707bff3
Author: Joshua Lock <josh at linux.intel.com>
Date: Mon Oct 31 14:53:14 2011 -0700
lib/oe/terminal: add support for XFCE's terminal emulator
That's Terminal on Fedora and xfce4-terminal on Ubuntu/Debian... This
could get interesting!
Signed-off-by: Joshua Lock <josh at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/lib/oe/terminal.py | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/meta/lib/oe/terminal.py b/meta/lib/oe/terminal.py
index 1455e8e..43639d5 100644
--- a/meta/lib/oe/terminal.py
+++ b/meta/lib/oe/terminal.py
@@ -57,6 +57,20 @@ class Gnome(XTerminal):
command = 'gnome-terminal --disable-factory -t "{title}" -x {command}'
priority = 2
+class Xfce(XTerminal):
+ command = 'Terminal -T "{title}" -e "{command}"'
+ priority = 2
+
+ def __init__(self, command, title=None, env=None):
+ # Upstream binary name is Terminal but Debian/Ubuntu use
+ # xfce4-terminal to avoid possible(?) conflicts
+ distro = distro_name()
+ if distro == 'ubuntu' or distro == 'debian':
+ cmd = 'xfce4-terminal -T "{title}" -e "{command}"'
+ else:
+ cmd = command
+ XTerminal.__init__(self, cmd, title, env)
+
class Konsole(XTerminal):
command = 'konsole -T "{title}" -e {command}'
priority = 2
@@ -131,3 +145,12 @@ def check_konsole_version(konsole):
if ver.startswith('Konsole'):
vernum = ver.split(' ')[-1]
return vernum
+
+def distro_name():
+ try:
+ p = Popen(['lsb_release', '-i'])
+ out, err = p.communicate()
+ distro = out.split(':')[1].strip().lower()
+ except:
+ distro = "unknown"
+ return distro
More information about the Openembedded-commits
mailing list