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

Make io.system a bit less silly.

Browse Source
This commit is contained in:
Kris Maglione
2008-12-19 17:27:25 -05:00
parent 480151cc4d
commit 491751bb62
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/io.js
View File

@@ -726,22 +726,20 @@ lookup:
return this.withTempFiles(function (stdin, stdout, stderr, cmd) { return this.withTempFiles(function (stdin, stdout, stderr, cmd) {
if (input) if (input)
{
this.writeFile(stdin, input); this.writeFile(stdin, input);
command += " <" + escape(stdin.path);
}
if (WINDOWS) if (WINDOWS)
{ {
command = "cd /D " + cwd.path + " && " + command + " > " + stdout.path + " 2> " + stderr.path; command = "cd /D " + cwd.path + " && " + command + " > " + stdout.path + " 2> " + stderr.path + " < " + stdin.path;
var res = this.run(options["shell"], options["shellcmdflag"].split(/\s+/).concat(command), true); var res = this.run(options["shell"], options["shellcmdflag"].split(/\s+/).concat(command), true);
} }
else else
{ {
this.writeFile(cmd, Array.concat("exec", options["shell"], options["shellcmdflag"].split(/\s+/), command).map(escape).join(" "));
command = "cd " + escape(cwd.path) + ' && eval "$(cat <' + escape(cmd.path) + ')" >' + escape(stdout.path) + " 2>" + escape(stderr.path); this.writeFile(cmd, "cd " + escape(cwd.path) + "\n" +
liberator.dump("command: " + command); ["exec", ">" + escape(stdout.path), "2>" + escape(stderr.path), "<" + escape(stdin.path),
res = this.run("/bin/sh", ["-c", command], true); escape(options["shell"]), options["shellcmdflag"], escape(command)].join(" "));
res = this.run("/bin/sh", ["-e", cmd.path], true);
} }
if (res > 0) // FIXME: Is this really right? Shouldn't we always show both? if (res > 0) // FIXME: Is this really right? Shouldn't we always show both?