[Pkg-javascript-commits] [node-cross-spawn] 03/04: Refreshed patches

[Ross Gammon]

This is an automated email from the git hooks/post-receive script.

ross-guest pushed a commit to branch master
in repository node-cross-spawn.

commit 955f0e834e8db067c2c4357592b1e30d4cad5542
Author: Ross Gammon <rossgammon at mail.dk>
Date:   Sun Aug 6 20:18:46 2017 +0200

    Refreshed patches
---
 debian/patches/nodejs_test.patch | 35 +++++++++++++----------------------
 debian/patches/shebang.patch     |  4 ++--
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/debian/patches/nodejs_test.patch b/debian/patches/nodejs_test.patch
index db243aa..621058b 100644
--- a/debian/patches/nodejs_test.patch
+++ b/debian/patches/nodejs_test.patch
@@ -4,18 +4,9 @@ Description: Fix test.js to use nodejs
 Forwarded: not-needed
 Author: Ross Gammon <rossgammon at mail.dk>
 
---- a/test/test.js
-+++ b/test/test.js
-@@ -67,7 +67,7 @@
-             });
- 
-             it('should support shebang in executables without /usr/bin/env', function (next) {
--                var nodejs = which.sync('node');
-+                var nodejs = which.sync('nodejs');
-                 var file = __dirname + '/fixtures/shebang_noenv';
- 
-                 fs.writeFileSync(file, '#!' + nodejs + '\n\nprocess.stdout.write(\'shebang works!\');', {
-@@ -95,7 +95,7 @@
+--- node-cross-spawn.orig/test/test.js
++++ node-cross-spawn/test/test.js
+@@ -58,7 +58,7 @@
              it('should support shebang in executables with relative path', function (next) {
                  var executable = './' + path.relative(process.cwd(), __dirname + '/fixtures/shebang');
  
@@ -24,7 +15,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
                      { mode: parseInt('0777', 8) });
                  process.env.PATH = path.normalize(__dirname + '/tmp/') + path.delimiter + process.env.PATH;
  
-@@ -111,7 +111,7 @@
+@@ -74,7 +74,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');
  
@@ -33,7 +24,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
                      { mode: parseInt('0777', 8) });
                  process.env.PATH = path.normalize(__dirname + '/tmp/') + path.delimiter + process.env.PATH;
  
-@@ -125,7 +125,7 @@
+@@ -88,7 +88,7 @@
              });
  
              it('should support shebang in executables with extensions', function (next) {
@@ -42,7 +33,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
  extension\');', { mode: parseInt('0777', 8) });
                  process.env.PATH = path.normalize(__dirname + '/tmp/') + path.delimiter + process.env.PATH;
  
-@@ -178,7 +178,7 @@
+@@ -141,7 +141,7 @@
              });
  
              it('should handle arguments with quotes', function (next) {
@@ -51,7 +42,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
                      __dirname + '/fixtures/echo',
                      '"foo"',
                      'foo"bar"foo',
-@@ -192,7 +192,7 @@
+@@ -155,7 +155,7 @@
              });
  
              it('should handle empty arguments', function (next) {
@@ -60,7 +51,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
                      __dirname + '/fixtures/echo',
                      'foo',
                      '',
-@@ -217,7 +217,7 @@
+@@ -180,7 +180,7 @@
              });
  
              it('should handle non-string arguments', function (next) {
@@ -69,7 +60,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
                      __dirname + '/fixtures/echo',
                      1234,
                  ], function (err, data, code) {
-@@ -230,7 +230,7 @@
+@@ -193,7 +193,7 @@
              });
  
              it('should handle arguments with spaces', function (next) {
@@ -78,7 +69,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
                      __dirname + '/fixtures/echo',
                      'I am',
                      'André Cruz',
-@@ -244,7 +244,7 @@
+@@ -207,7 +207,7 @@
              });
  
              it('should handle arguments with \\"', function (next) {
@@ -87,7 +78,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
                      __dirname + '/fixtures/echo',
                      'foo',
                      '\\"',
-@@ -259,7 +259,7 @@
+@@ -222,7 +222,7 @@
              });
  
              it('should handle arguments that end with \\', function (next) {
@@ -96,7 +87,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
                      __dirname + '/fixtures/echo',
                      'foo',
                      'bar\\',
-@@ -274,7 +274,7 @@
+@@ -237,7 +237,7 @@
              });
  
              it('should handle arguments that contain shell special chars', function (next) {
@@ -105,7 +96,7 @@ Author: Ross Gammon <rossgammon at mail.dk>
                      __dirname + '/fixtures/echo',
                      'foo',
                      '()',
-@@ -367,7 +367,7 @@
+@@ -330,7 +330,7 @@
              });
  
              it('should give correct exit code', function (next) {
diff --git a/debian/patches/shebang.patch b/debian/patches/shebang.patch
index 1245a6a..0b98bf2 100644
--- a/debian/patches/shebang.patch
+++ b/debian/patches/shebang.patch
@@ -4,8 +4,8 @@ Description: Fix shebang in upstream test
 Forwarded: not-needed
 Author: Ross Gammon <rossgammon at mail.dk>
 
---- a/test/fixtures/shebang
-+++ b/test/fixtures/shebang
+--- node-cross-spawn.orig/test/fixtures/shebang
++++ node-cross-spawn/test/fixtures/shebang
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env node
 +#!/usr/bin/env nodejs

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-cross-spawn.git