have to swap out the slashes so that the dirname command returns a us…

…able path, this is primarily for msysgit bash support
npm · Oct 28, 2013 · 8bee9f6 · 8bee9f6
1 parent 250b351
commit 8bee9f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -132,7 +132,7 @@ function writeShim_ (from, to, prog, args, cb) {
 
   if (shLongProg) {
     sh = sh
-        + "basedir=`dirname \"$0\"`\n"
+        + "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n"
         + "\n"
         + "case `uname` in\n"
         + "    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;\n"

diff --git a/test/basic.js b/test/basic.js
@@ -31,7 +31,7 @@ test('env shebang', function (t) {
 
     t.equal(fs.readFileSync(to, 'utf8'),
             "#!/bin/sh"+
-            "\nbasedir=`dirname \"$0\"`"+
+            "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")"+
             "\n"+
             "\ncase `uname` in"+
             "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+
@@ -67,7 +67,7 @@ test('env shebang with args', function (t) {
 
     t.equal(fs.readFileSync(to, 'utf8'),
             "#!/bin/sh"+
-            "\nbasedir=`dirname \"$0\"`"+
+            "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")"+
             "\n"+
             "\ncase `uname` in"+
             "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;"+
@@ -103,7 +103,7 @@ test('explicit shebang', function (t) {
 
     t.equal(fs.readFileSync(to, 'utf8'),
             "#!/bin/sh" +
-            "\nbasedir=`dirname \"$0\"`" +
+            "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")" +
             "\n" +
             "\ncase `uname` in" +
             "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" +
@@ -140,7 +140,7 @@ test('explicit shebang with args', function (t) {
 
     t.equal(fs.readFileSync(to, 'utf8'),
             "#!/bin/sh" +
-            "\nbasedir=`dirname \"$0\"`" +
+            "\nbasedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")" +
             "\n" +
             "\ncase `uname` in" +
             "\n    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;" +