[gnome-builder] terminal: use /bin/bash for debug-terminal in flatpak



commit 17b003411c8bfb2db5ecda266e80ca5d530f96d4
Author: Christian Hergert <chergert redhat com>
Date:   Thu Jul 25 11:35:48 2019 -0700

    terminal: use /bin/bash for debug-terminal in flatpak
    
    We can ignore the users preferred shell when we are running inside of
    our flatpak container for "debug-terminal" since we only have /bin/sh or
    /bin/bash to work with.
    
    Fixes #982

 src/libide/terminal/ide-terminal-launcher.c | 4 ++++
 1 file changed, 4 insertions(+)
---
diff --git a/src/libide/terminal/ide-terminal-launcher.c b/src/libide/terminal/ide-terminal-launcher.c
index faad6e05f..b6dc382ea 100644
--- a/src/libide/terminal/ide-terminal-launcher.c
+++ b/src/libide/terminal/ide-terminal-launcher.c
@@ -204,6 +204,10 @@ spawn_host_launcher (IdeTerminalLauncher *self,
 
   if (!(shell = ide_terminal_launcher_get_shell (self)))
     shell = ide_get_user_shell ();
+
+  /* We only have sh/bash in our flatpak */
+  if (self->kind == LAUNCHER_KIND_DEBUG && ide_is_flatpak ())
+    shell = "/bin/bash";
  
   launcher = ide_subprocess_launcher_new (0);
   ide_subprocess_launcher_set_run_on_host (launcher, run_on_host);


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