summaryrefslogtreecommitdiff
path: root/grc/gui
diff options
context:
space:
mode:
authormormj <mormjb@gmail.com>2020-11-16 14:25:36 -0500
committermormj <34754695+mormj@users.noreply.github.com>2020-12-17 07:55:35 -0500
commiteb228006d946f02f062073d5651aaf715abe00d9 (patch)
tree3ec6305967baf239b5781c1ecaabd558c6e2a10f /grc/gui
parentc4f46bfa6d790c57018f9c6fca264bb9e01a2854 (diff)
grc: remove gnome-terminal deprecation warning
When running a "No GUI" flowgraph from GRC, it gives the following deprecation warning: Option ā€œ-eā€ is deprecated and might be removed in a later version of gnome-terminal. Use ā€œ-- ā€ to terminate the options and put the command line to execute after it. This follows the suggested fix to update the deprecation Signed-off-by: Josh Morman <jmorman@perspectalabs.com>
Diffstat (limited to 'grc/gui')
-rw-r--r--grc/gui/Executor.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/grc/gui/Executor.py b/grc/gui/Executor.py
index 66558c96eb..4505ef0b37 100644
--- a/grc/gui/Executor.py
+++ b/grc/gui/Executor.py
@@ -56,7 +56,10 @@ class ExecFlowGraphThread(threading.Thread):
# When in no gui mode on linux, use a graphical terminal (looks nice)
xterm_executable = find_executable(self.xterm_executable)
if generator.generate_options == 'no_gui' and xterm_executable:
- run_command_args = [xterm_executable, '-e', run_command]
+ if ('gnome-terminal' in xterm_executable):
+ run_command_args = [xterm_executable, '--'] + run_command_args
+ else:
+ run_command_args = [xterm_executable, '-e', run_command]
# this does not reproduce a shell executable command string, if a graphical
# terminal is used. Passing run_command though shlex_quote would do it but