fixes patches nodejs

This commit is contained in:
Marc
2022-02-26 19:31:33 +01:00
parent 24c03e8090
commit a6f0b3367c
2 changed files with 28 additions and 18 deletions
+1 -1
View File
@@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
patch -R src/node-${VERSION}/lib/child_process.js patches/child_process_executor.diff patch src/node-${VERSION}/lib/child_process.js patches/child_process_executor.diff
+27 -17
View File
@@ -1,18 +1,28 @@
586,591d585 576,587c576,578
< } else if (typeof options.shell === 'string') { < if (process.platform === 'win32') {
< file = '/bin/executor'; < if (typeof options.shell === 'string')
< args = [ options.shell, '-c', command]; < file = options.shell;
< } else if (process.platform === 'android') { < else
< file = '/system/bin/sh'; < file = process.env.comspec || 'cmd.exe';
< args = ['-c', command]; < // '/d /s /c' is used only for cmd.exe.
593,594c587,593 < if (RegExpPrototypeTest(/^(?:.*\\)?cmd(?:\.exe)?$/i, file)) {
< file = '/bin/executor'; < args = ['/d', '/s', '/c', `"${command}"`];
< args = command.split(' '); < windowsVerbatimArguments = true;
< } else {
< args = ['-c', command];
< }
--- ---
> if (typeof options.shell === 'string') > if (typeof options.shell === 'string') {
> file = options.shell; > file = '/bin/executor';
> else if (process.platform === 'android') > args = [ options.shell, ...command.split(' ') ]
> file = '/system/bin/sh'; 589,595c580,581
> else < if (typeof options.shell === 'string')
> file = '/bin/sh'; < file = options.shell;
> args = ['-c', command]; < else if (process.platform === 'android')
< file = '/system/bin/sh';
< else
< file = '/bin/sh';
< args = ['-c', command];
---
> file = '/bin/executor';;
> args = command.split(' ');