kiss-lang/kiss
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Prelude.tryProcess allow cwd for every sys target except Java

Browse Source
This commit is contained in:
Nat Quayle Nelson
2022-09-29 20:30:46 +00:00
parent ec166d52ce
commit 31c0ebcd95
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/kiss/Prelude.hx
View File

@@ -657,7 +657,7 @@ class Prelude {
return tryProcess(command, args, (error) -> { throw error; }, inputLines, fullProcess); return tryProcess(command, args, (error) -> { throw error; }, inputLines, fullProcess);
} }
public static function tryProcess(command:String, args:Array<String>, handleError:String->Void, ?inputLines:Array<String>, fullProcess = true):String { public static function tryProcess(command:String, args:Array<String>, handleError:String->Void, ?inputLines:Array<String>, fullProcess = true, cwd:String = null):String {
#if test #if test
Prelude.print('running $command $args $inputLines from ${Prelude.getTarget()}'); Prelude.print('running $command $args $inputLines from ${Prelude.getTarget()}');
#end #end
@@ -675,6 +675,7 @@ class Prelude {
stdin: -1, // -1 represents PIPE which allows communication stdin: -1, // -1 represents PIPE which allows communication
stdout: -1, stdout: -1,
stderr: -1, stderr: -1,
cwd: cwd
}); });
if (inputLines != null) { if (inputLines != null) {
for (line in inputLines) { for (line in inputLines) {
@@ -698,6 +699,13 @@ class Prelude {
p.terminate(); p.terminate();
return output; return output;
#elseif sys #elseif sys
var lastCwd = Sys.getCwd();
if (cwd != null) {
#if java
throw 'Kiss cannot specify the working directory of a subprocess in Java';
#end
Sys.setCwd(cwd);
}
var p = new Process(command, args); var p = new Process(command, args);
if (inputLines != null) { if (inputLines != null) {
for (line in inputLines) { for (line in inputLines) {
@@ -716,12 +724,15 @@ class Prelude {
} }
p.kill(); p.kill();
p.close(); p.close();
if (cwd != null) {
Sys.setCwd(lastCwd);
}
return output; return output;
#elseif hxnodejs #elseif hxnodejs
var p = if (inputLines != null) { var p = if (inputLines != null) {
ChildProcess.spawnSync(command, args, {input: inputLines.join("\n")}); ChildProcess.spawnSync(command, args, {input: inputLines.join("\n"), cwd: cwd});
} else { } else {
ChildProcess.spawnSync(command, args); ChildProcess.spawnSync(command, args, {cwd: cwd});
} }
var output = switch (p.status) { var output = switch (p.status) {
case 0: case 0: