[Pkg-javascript-commits] [node-cross-spawn] 03/06: Refresh patches
Sruthi Chandran
srud-guest at moszumanska.debian.org
Mon Nov 7 06:42:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
srud-guest pushed a commit to branch master
in repository node-cross-spawn.
commit 7792016be617e260a40bcace782354d7c29ac8e2
Author: Sruthi <srud at disroot.org>
Date: Mon Nov 7 11:52:17 2016 +0530
Refresh patches
---
debian/patches/nodejs_test.patch | 58 ++++++++++++++++++++++++++--------------
debian/patches/series | 1 -
debian/patches/shebang.patch | 9 ++++---
debian/patches/spawn-sync.patch | 19 -------------
4 files changed, 43 insertions(+), 44 deletions(-)
diff --git a/debian/patches/nodejs_test.patch b/debian/patches/nodejs_test.patch
index 3172dc8..db243aa 100644
--- a/debian/patches/nodejs_test.patch
+++ b/debian/patches/nodejs_test.patch
@@ -4,9 +4,9 @@ Description: Fix test.js to use nodejs
Forwarded: not-needed
Author: Ross Gammon <rossgammon at mail.dk>
---- node-cross-spawn.orig/test/test.js
-+++ node-cross-spawn/test/test.js
-@@ -66,7 +66,7 @@
+--- a/test/test.js
++++ b/test/test.js
+@@ -67,7 +67,7 @@
});
it('should support shebang in executables without /usr/bin/env', function (next) {
@@ -15,25 +15,43 @@ Author: Ross Gammon <rossgammon at mail.dk>
var file = __dirname + '/fixtures/shebang_noenv';
fs.writeFileSync(file, '#!' + nodejs + '\n\nprocess.stdout.write(\'shebang works!\');', {
-@@ -94,7 +94,7 @@
+@@ -95,7 +95,7 @@
it('should support shebang in executables with relative path', function (next) {
var executable = './' + path.relative(process.cwd(), __dirname + '/fixtures/shebang');
-- fs.writeFileSync(__dirname + '/tmp/shebang', '#!/usr/bin/env node\n\nprocess.stdout.write(\'yeah\');', { mode: parseInt('0777', 8) });
-+ fs.writeFileSync(__dirname + '/tmp/shebang', '#!/usr/bin/env nodejs\n\nprocess.stdout.write(\'yeah\');', { mode: parseInt('0777', 8) });
+- fs.writeFileSync(__dirname + '/tmp/shebang', '#!/usr/bin/env node\n\nprocess.stdout.write(\'yeah\');',
++ fs.writeFileSync(__dirname + '/tmp/shebang', '#!/usr/bin/env nodejs\n\nprocess.stdout.write(\'yeah\');',
+ { mode: parseInt('0777', 8) });
process.env.PATH = path.normalize(__dirname + '/tmp/') + path.delimiter + process.env.PATH;
- buffered(method, executable, function (err, data, code) {
-@@ -107,7 +107,7 @@
+@@ -111,7 +111,7 @@
+ it('should support shebang in executables with relative path that starts with `..`', function (next) {
+ var executable = '../' + path.basename(process.cwd()) + '/' + path.relative(process.cwd(), __dirname + '/fixtures/shebang');
+
+- fs.writeFileSync(__dirname + '/tmp/shebang', '#!/usr/bin/env node\n\nprocess.stdout.write(\'yeah\');',
++ fs.writeFileSync(__dirname + '/tmp/shebang', '#!/usr/bin/env nodejs\n\nprocess.stdout.write(\'yeah\');',
+ { mode: parseInt('0777', 8) });
+ process.env.PATH = path.normalize(__dirname + '/tmp/') + path.delimiter + process.env.PATH;
+
+@@ -125,7 +125,7 @@
});
it('should support shebang in executables with extensions', function (next) {
-- fs.writeFileSync(__dirname + '/tmp/shebang_' + method + '.js', '#!/usr/bin/env node\n\nprocess.stdout.write(\'shebang with extension\');', { mode: parseInt('0777', 8) });
-+ fs.writeFileSync(__dirname + '/tmp/shebang_' + method + '.js', '#!/usr/bin/env nodejs\n\nprocess.stdout.write(\'shebang with extension\');', { mode: parseInt('0777', 8) });
+- fs.writeFileSync(__dirname + '/tmp/shebang_' + method + '.js', '#!/usr/bin/env node\n\nprocess.stdout.write(\'shebang with \
++ fs.writeFileSync(__dirname + '/tmp/shebang_' + method + '.js', '#!/usr/bin/env nodejs\n\nprocess.stdout.write(\'shebang with \
+ extension\');', { mode: parseInt('0777', 8) });
process.env.PATH = path.normalize(__dirname + '/tmp/') + path.delimiter + process.env.PATH;
- buffered(method, __dirname + '/tmp/shebang_' + method + '.js', function (err, data, code) {
-@@ -159,7 +159,7 @@
+@@ -178,7 +178,7 @@
+ });
+
+ it('should handle arguments with quotes', function (next) {
+- buffered(method, 'node', [
++ buffered(method, 'nodejs', [
+ __dirname + '/fixtures/echo',
+ '"foo"',
+ 'foo"bar"foo',
+@@ -192,7 +192,7 @@
});
it('should handle empty arguments', function (next) {
@@ -42,16 +60,16 @@ Author: Ross Gammon <rossgammon at mail.dk>
__dirname + '/fixtures/echo',
'foo',
'',
-@@ -184,7 +184,7 @@
+@@ -217,7 +217,7 @@
});
it('should handle non-string arguments', function (next) {
- buffered(method, 'node', [
+ buffered(method, 'nodejs', [
__dirname + '/fixtures/echo',
- 1234
+ 1234,
], function (err, data, code) {
-@@ -197,7 +197,7 @@
+@@ -230,7 +230,7 @@
});
it('should handle arguments with spaces', function (next) {
@@ -59,8 +77,8 @@ Author: Ross Gammon <rossgammon at mail.dk>
+ buffered(method, 'nodejs', [
__dirname + '/fixtures/echo',
'I am',
- 'André Cruz'
-@@ -211,7 +211,7 @@
+ 'André Cruz',
+@@ -244,7 +244,7 @@
});
it('should handle arguments with \\"', function (next) {
@@ -69,7 +87,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
__dirname + '/fixtures/echo',
'foo',
'\\"',
-@@ -226,7 +226,7 @@
+@@ -259,7 +259,7 @@
});
it('should handle arguments that end with \\', function (next) {
@@ -78,7 +96,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
__dirname + '/fixtures/echo',
'foo',
'bar\\',
-@@ -241,7 +241,7 @@
+@@ -274,7 +274,7 @@
});
it('should handle arguments that contain shell special chars', function (next) {
@@ -87,7 +105,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
__dirname + '/fixtures/echo',
'foo',
'()',
-@@ -334,7 +334,7 @@
+@@ -367,7 +367,7 @@
});
it('should give correct exit code', function (next) {
diff --git a/debian/patches/series b/debian/patches/series
index d44e048..73261e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
nodejs_test.patch
-spawn-sync.patch
shebang.patch
diff --git a/debian/patches/shebang.patch b/debian/patches/shebang.patch
index 9f950b6..1245a6a 100644
--- a/debian/patches/shebang.patch
+++ b/debian/patches/shebang.patch
@@ -4,10 +4,11 @@ Description: Fix shebang in upstream test
Forwarded: not-needed
Author: Ross Gammon <rossgammon at mail.dk>
---- node-cross-spawn.orig/test/fixtures/shebang
-+++ node-cross-spawn/test/fixtures/shebang
-@@ -1,3 +1,3 @@
+--- a/test/fixtures/shebang
++++ b/test/fixtures/shebang
+@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env nodejs
- process.stdout.write('shebang works!');
+ 'use strict';
+
diff --git a/debian/patches/spawn-sync.patch b/debian/patches/spawn-sync.patch
deleted file mode 100644
index 78fcfce..0000000
--- a/debian/patches/spawn-sync.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Use nodejs spawn-sync instead of separate npm module
- The upstream node-cross-spawn project depends on node-spawn-sync which
- for nodejs >= 0.12 basically just exports the built in
- child_process.spawnSync function from nodejs.
- This patch forces index.js to use the packaged nodejs spawnSync
- function instead of requiring a debian package for node-spawn-sync.
-Forwarded: not-needed
-Author: Ross Gammon <rossgammon at mail.dk>
-
---- node-cross-spawn.orig/index.js
-+++ node-cross-spawn/index.js
-@@ -1,6 +1,6 @@
- 'use strict';
-
--var sync = require('spawn-sync');
-+var sync = require('child_process').spawnSync;
- var crossSpawn = require('cross-spawn-async');
- var parse = require('cross-spawn-async/lib/parse');
- var enoent = require('cross-spawn-async/lib/enoent');
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-cross-spawn.git
More information about the Pkg-javascript-commits
mailing list