[gnome-builder] terminal: don't use runtime for preferred shell discover



commit c1f8912df0575228ddf3352bd267fbd4194f0286
Author: Christian Hergert <chergert redhat com>
Date:   Mon Mar 6 14:47:02 2017 -0800

    terminal: don't use runtime for preferred shell discover
    
    This is more likely to make us end up with something like /bin/sh if we
    try to run getent from within the runtime.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=779678

 plugins/terminal/gb-terminal-view.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/plugins/terminal/gb-terminal-view.c b/plugins/terminal/gb-terminal-view.c
index 2e0cb00..c92238a 100644
--- a/plugins/terminal/gb-terminal-view.c
+++ b/plugins/terminal/gb-terminal-view.c
@@ -101,11 +101,11 @@ gb_terminal_view_discover_shell (GbTerminalView  *self,
   if (!g_shell_parse_argv (command, NULL, &argv, error))
     return NULL;
 
-  if (self->runtime != NULL)
-    launcher = ide_runtime_create_launcher (self->runtime, NULL);
-
-  if (launcher == NULL)
-    launcher = ide_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE);
+  /*
+   * We don't use the runtime shell here, because we want to know
+   * what the host thinks the user shell should be.
+   */
+  launcher = ide_subprocess_launcher_new (G_SUBPROCESS_FLAGS_STDOUT_PIPE);
 
   ide_subprocess_launcher_set_run_on_host (launcher, TRUE);
   ide_subprocess_launcher_set_clear_env (launcher, FALSE);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]