From b47711ab274e2de40e014dc72d9d87f884a893d7 Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Tue, 18 Oct 2016 23:55:34 +0000 Subject: [PATCH] When invoking Terminal, don't assume the default shell Summary: If a user has their shell set to a non-POSIX conferment shell the TestTerminal.py tests fail because the shell blurb constructed here may not work in their shell. In my specific case fish-shell (The Friendly Interactive Shell - http://fishshell.com) does not support $?, it instead uses $status (because it is friendly). This patch removes the assumption of your default shell by running the constructed bash command via "/bin/bash -c ...". This should be safer for users mutating their shell environment. Reviewers: tfiala Subscribers: joerg, lldb-commits Differential Revision: https://reviews.llvm.org/D25750 llvm-svn: 284552 --- lldb/source/Host/macosx/Host.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lldb/source/Host/macosx/Host.mm b/lldb/source/Host/macosx/Host.mm index e477d4b..47fd462 100644 --- a/lldb/source/Host/macosx/Host.mm +++ b/lldb/source/Host/macosx/Host.mm @@ -354,11 +354,11 @@ static bool WaitForProcessToSIGSTOP(const lldb::pid_t pid, const char *applscript_in_new_tty = "tell application \"Terminal\"\n" " activate\n" - " do script \"%s\"\n" + " do script \"/bin/bash -c '%s';exit\"\n" "end tell\n"; const char *applscript_in_existing_tty = "\ -set the_shell_script to \"%s\"\n\ +set the_shell_script to \"/bin/bash -c '%s';exit\"\n\ tell application \"Terminal\"\n\ repeat with the_window in (get windows)\n\ repeat with the_tab in tabs of the_window\n\ -- 2.7.4