summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMaxime Coste <frrrwww@gmail.com>2014-03-25 09:28:44 +0000
committerMaxime Coste <frrrwww@gmail.com>2014-03-25 09:28:44 +0000
commit764e450fddc1cf4a001aeb0f52adfc2e345112ac (patch)
tree22ff5b0de6c730c86ebee424f787abddcf231fbb /src
parentc9b72e1d3231fd87dbaab6f2897cf4782826ff3d (diff)
Remove the shell option, always use /bin/sh
Diffstat (limited to 'src')
-rw-r--r--src/option_manager.cc1
-rw-r--r--src/shell_manager.cc2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/option_manager.cc b/src/option_manager.cc
index cd144084..c917d8e8 100644
--- a/src/option_manager.cc
+++ b/src/option_manager.cc
@@ -125,7 +125,6 @@ GlobalOptions::GlobalOptions()
declare_option<int>("scrolloff", 0);
declare_option<String>("eolformat", "lf");
declare_option<String>("BOM", "no");
- declare_option<String>("shell", "bash");
declare_option<bool>("complete_prefix", true);
declare_option<bool>("incsearch", true);
declare_option<bool>("autoinfo", true);
diff --git a/src/shell_manager.cc b/src/shell_manager.cc
index 7663e2f8..1d3d8625 100644
--- a/src/shell_manager.cc
+++ b/src/shell_manager.cc
@@ -119,7 +119,7 @@ String ShellManager::pipe(const String& input,
++it;
}
- String shell = context.options()["shell"].get<String>();
+ String shell = "/bin/sh";
std::vector<const char*> execparams = { shell.c_str(), "-c", cmdline.c_str() };
if (not params.empty())
execparams.push_back(shell.c_str());