[gnome-builder] terminal: fallback to bash on flatpak
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] terminal: fallback to bash on flatpak
- Date: Mon, 19 Sep 2016 18:31:02 +0000 (UTC)
commit 15f344f576fb500361d3216f19b28be174a5f041
Author: Christian Hergert <chergert redhat com>
Date: Mon Sep 19 11:30:36 2016 -0700
terminal: fallback to bash on flatpak
If we are on flatpak, we know that /bin/bash is available and the passwd
will define /bin/sh as the terminal. We would prefer to default to bash
over sh for general usefulness.
plugins/terminal/gb-terminal-view.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --git a/plugins/terminal/gb-terminal-view.c b/plugins/terminal/gb-terminal-view.c
index 3b18c8d..6f16a89 100644
--- a/plugins/terminal/gb-terminal-view.c
+++ b/plugins/terminal/gb-terminal-view.c
@@ -221,8 +221,14 @@ gb_terminal_respawn (GbTerminalView *self,
if (shell == NULL)
{
g_warning ("Failed to discover user shell: %s", error->message);
+
+ /* We prefer bash in flatpak over sh */
+ if (ide_is_flatpak ())
+ shell = g_strdup ("/bin/bash");
+ else
+ shell = vte_get_user_shell ();
+
g_clear_error (&error);
- shell = vte_get_user_shell ();
}
args = g_ptr_array_new ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]