Changeset ac49d23c in mainline

Timestamp:

2019-06-21T12:12:20Z (5 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

fd244cd

Parents:

3498bd5

Message:

tools/ew.py: Add support for gnome-terminal

Also adds informative error message when no terminal emulator is found.

File:

• tools/ew.py (modified) (2 diffs)

tools/ew.py

@@ -57 +57 @@
 
 def termemu_detect():
-        for termemu in ['xfce4-terminal', 'xterm']:
+        emus = ['gnome-terminal', 'xfce4-terminal', 'xterm']
+        for termemu in emus:
                 try:
                         subprocess.check_output('which ' + termemu, shell = True)
@@ -64 +65 @@
                         pass
 
+        print('Could not find any of the terminal emulators %s.'%(emus))
+        sys.exit(1)
+
 def run_in_console(cmd, title):
         ecmd = cmd.replace('"', '\\"')
-        cmdline = termemu_detect() + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
+        temu = termemu_detect()
+        if temu == 'gnome-terminal':
+                cmdline = temu + ' -- ' + ecmd
+        else:
+                cmdline = temu + ' -T ' + '"' + title + '"' + ' -e "' + ecmd + '"'
+
         print(cmdline)
         if not is_override('dryrun'):