fix npm#35: always set $basedir for win32 bash

coolaj86 · Aug 10, 2019 · eb8f5fb · eb8f5fb
1 parent 75edc98
commit eb8f5fb
Showing 1 changed file with 6 additions and 8 deletions.
diff --git a/index.js b/index.js
@@ -129,16 +129,14 @@ function writeShim_ (from, to, prog, args, cb) {
   // exit $ret
 
   var sh = "#!/bin/sh\n"
+      + "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n"
+      + "\n"
+      + "case `uname` in\n"
+      + "    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;\n"
+      + "esac\n"
+      + "\n"
 
   if (shLongProg) {
-    sh = sh
-        + "basedir=$(dirname \"$(echo \"$0\" | sed -e 's,\\\\,/,g')\")\n"
-        + "\n"
-        + "case `uname` in\n"
-        + "    *CYGWIN*) basedir=`cygpath -w \"$basedir\"`;;\n"
-        + "esac\n"
-        + "\n"
-
     sh = sh
        + "if [ -x "+shLongProg+" ]; then\n"
        + "  " + shLongProg + " " + args + " " + shTarget + " \"$@\"\n"