gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 10:47:59 +01:00
Code Issues Projects Releases Wiki Activity

add initial implementation of 'shell' and 'shellcmdflag' options

Browse Source
This commit is contained in:
Doug Kearns
2008-08-13 05:28:35 +00:00
parent e8eab457f7
commit 5a2b88c496
3 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
content/io.js
View File

@@ -41,6 +41,34 @@ liberator.IO = function () //{{{
var extname = liberator.config.name.toLowerCase(); // "vimperator" or "muttator"
var lastRunCommand = ""; // updated whenever the users runs a command with :!
/////////////////////////////////////////////////////////////////////////////}}}
////////////////////// OPTIONS ////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{
var shell, shellcmdflag;
if (WINDOWS)
{
shell = "cmd.exe";
// TODO: does setting 'shell' to "something containing sh"
// automatically update 'shellcmdflag' on Windows in Vim?
shellcmdflag = "/c";
}
else
{
shell = environmentService.get("SHELL") || "sh";
shellcmdflag = "-c";
}
// TODO: setter should expand environment variables
liberator.options.add(["shell", "sh"],
"Shell to use for executing :! and :run commands",
"string", shell);
liberator.options.add(["shellcmdflag", "shcf"],
"Flag passed to shell when executing :! and :run commands",
"string", shellcmdflag);
/////////////////////////////////////////////////////////////////////////////}}}
////////////////////// COMMANDS ////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////{{{
@@ -507,7 +535,6 @@ lookup:
// when https://bugzilla.mozilla.org/show_bug.cgi?id=68702 is fixed
// is fixed, should use that instead of a tmpfile
// TODO: add shell/shellcmdflag options to replace "sh" and "-c"
system: function (str, input)
{
var fileout = ioManager.createTempFile();
@@ -527,11 +554,8 @@ lookup:
command += " < \"" + filein.path.replace('"', '\\"') + "\"";
}
var res;
if (WINDOWS)
res = ioManager.run("cmd.exe", ["/C", command], true);
else
res = ioManager.run("sh", ["-c", command], true);
// FIXME: why is this return value being ignored?
var res = ioManager.run(liberator.options["shell"], [liberator.options["shellcmdflag"], command], true);
var output = ioManager.readFile(fileout);
fileout.remove(false);