From 764e450fddc1cf4a001aeb0f52adfc2e345112ac Mon Sep 17 00:00:00 2001 From: Maxime Coste Date: Tue, 25 Mar 2014 09:28:44 +0000 Subject: [PATCH] Remove the shell option, always use /bin/sh --- README.asciidoc | 2 -- src/option_manager.cc | 1 - src/shell_manager.cc | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/README.asciidoc b/README.asciidoc index f0ca55bf8..5cadcc0e8 100644 --- a/README.asciidoc +++ b/README.asciidoc @@ -512,8 +512,6 @@ Some options are built in Kakoune, and can be used to control it's behaviour: writing a buffer, this is autodetected on load. * +BOM+ _string_ ("no" or "utf-8"): define if the file should be written with an unicode byte order mark. - * +shell+ _string_ ("bash" by default): what command to run to evaluate - shell commands. * +complete_prefix+ _bool_: when completing in command line, and multiple candidates exist, enable completion with common prefix. * +incsearch+ _bool_: execute search as it is typed diff --git a/src/option_manager.cc b/src/option_manager.cc index cd1440841..c917d8e88 100644 --- a/src/option_manager.cc +++ b/src/option_manager.cc @@ -125,7 +125,6 @@ GlobalOptions::GlobalOptions() declare_option("scrolloff", 0); declare_option("eolformat", "lf"); declare_option("BOM", "no"); - declare_option("shell", "bash"); declare_option("complete_prefix", true); declare_option("incsearch", true); declare_option("autoinfo", true); diff --git a/src/shell_manager.cc b/src/shell_manager.cc index 7663e2f85..1d3d8625f 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 shell = "/bin/sh"; std::vector execparams = { shell.c_str(), "-c", cmdline.c_str() }; if (not params.empty()) execparams.push_back(shell.c_str());