Reliably resolve the executable's parent dir

%~dp0 is not reliable. If the batch file invocation is quoted and invoked without a path, %~dp0 is set to $PWD instead of the batch file's parent directory. Fixes npm#10
staticshock · Jan 16, 2015 · 72d66f4 · 72d66f4
1 parent 8d4210e
commit 72d66f4
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 22 deletions.
diff --git a/index.js b/index.js
@@ -80,36 +80,46 @@ function writeShim_ (from, to, prog, args, cb) {
   shTarget = shTarget.split("\\").join("/")
   args = args || ""
   if (!prog) {
-    prog = "\"%~dp0\\" + target + "\""
+    prog = "\"%dir%\\" + target + "\""
     shProg = "\"$basedir/" + shTarget + "\""
     args = ""
     target = ""
     shTarget = ""
   } else {
-    longProg = "\"%~dp0\\" + prog + ".exe\""
+    longProg = "\"%dir%\\" + prog + ".exe\""
     shLongProg = "\"$basedir/" + prog + "\""
-    target = "\"%~dp0\\" + target + "\""
+    target = "\"%dir%\\" + target + "\""
     shTarget = "\"$basedir/" + shTarget + "\""
   }
 
-  // @IF EXIST "%~dp0\node.exe" (
-  //   "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+  // @ECHO.%0 | FINDSTR /C:\ /C:/ >NUL && (
+  //   SET dir=%~dp0
+  // ) || (
+  //   FOR /F %%i IN ('where %0') DO @SET dir=%%~dpi
+  // )
+  // @IF EXIST "%dir%\node.exe" (
+  //   "%dir%\node.exe" "%dir%\.\node_modules\npm\bin\npm-cli.js" %*
   // ) ELSE (
   //   SETLOCAL
   //   SET PATHEXT=%PATHEXT:;.JS;=;%
-  //   node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+  //   node "%dir%\.\node_modules\npm\bin\npm-cli.js" %*
   // )
-  var cmd
+  var cmd = "@ECHO.%0 | FINDSTR /C:\\ /C:/ >NUL && (\r\n"
+          + "  SET dir=%~dp0\r\n"
+          + ") || (\r\n"
+          + "  FOR /F %%i IN ('where %0') DO @SET dir=%%~dpi\r\n"
+          + ")\r\n"
   if (longProg) {
-    cmd = "@IF EXIST " + longProg + " (\r\n"
+    cmd = cmd
+        + "@IF EXIST " + longProg + " (\r\n"
         + "  " + longProg + " " + args + " " + target + " %*\r\n"
         + ") ELSE (\r\n"
         + "  @SETLOCAL\r\n"
         + "  @SET PATHEXT=%PATHEXT:;.JS;=;%\r\n"
         + "  " + prog + " " + args + " " + target + " %*\r\n"
         + ")"
   } else {
-    cmd = prog + " " + args + " " + target + " %*\r\n"
+    cmd = cmd + prog + " " + args + " " + target + " %*\r\n"
   }
 
   // #!/bin/sh

diff --git a/test/basic.js b/test/basic.js
@@ -6,6 +6,12 @@ var fixtures = path.resolve(__dirname, 'fixtures')
 
 var cmdShim = require('../')
 
+var resolveDir = "@ECHO.%0 | FINDSTR /C:\\ /C:/ >NUL && (\r\n"
+               + "  SET dir=%~dp0\r\n"
+               + ") || (\r\n"
+               + "  FOR /F %%i IN ('where %0') DO @SET dir=%%~dpi\r\n"
+               + ")\r\n"
+
 test('no shebang', function (t) {
   var from = path.resolve(fixtures, 'from.exe')
   var to = path.resolve(fixtures, 'exe.shim')
@@ -15,7 +21,7 @@ test('no shebang', function (t) {
     t.equal(fs.readFileSync(to, 'utf8'),
             "\"$basedir/from.exe\"   \"$@\"\nexit $?\n")
     t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
-            "\"%~dp0\\from.exe\"   %*\r\n")
+            resolveDir + "\"%dir%\\from.exe\"   %*\r\n")
     t.end()
   })
 })
@@ -47,12 +53,13 @@ test('env shebang', function (t) {
             "\nexit $ret"+
             "\n")
     t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
-            "@IF EXIST \"%~dp0\\node.exe\" (\r"+
-            "\n  \"%~dp0\\node.exe\"  \"%~dp0\\from.env\" %*\r"+
+            resolveDir+
+            "@IF EXIST \"%dir%\\node.exe\" (\r"+
+            "\n  \"%dir%\\node.exe\"  \"%dir%\\from.env\" %*\r"+
             "\n) ELSE (\r"+
             "\n  @SETLOCAL\r"+
             "\n  @SET PATHEXT=%PATHEXT:;.JS;=;%\r"+
-            "\n  node  \"%~dp0\\from.env\" %*\r"+
+            "\n  node  \"%dir%\\from.env\" %*\r"+
             "\n)")
     t.end()
   })
@@ -85,12 +92,13 @@ test('env shebang with args', function (t) {
             "\nexit $ret"+
             "\n")
     t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
-            "@IF EXIST \"%~dp0\\node.exe\" (\r"+
-            "\n  \"%~dp0\\node.exe\"  --expose_gc \"%~dp0\\from.env.args\" %*\r"+
+            resolveDir+
+            "@IF EXIST \"%dir%\\node.exe\" (\r"+
+            "\n  \"%dir%\\node.exe\"  --expose_gc \"%dir%\\from.env.args\" %*\r"+
             "\n) ELSE (\r"+
             "\n  @SETLOCAL\r"+
             "\n  @SET PATHEXT=%PATHEXT:;.JS;=;%\r"+
-            "\n  node  --expose_gc \"%~dp0\\from.env.args\" %*\r"+
+            "\n  node  --expose_gc \"%dir%\\from.env.args\" %*\r"+
             "\n)")
     t.end()
   })
@@ -124,12 +132,13 @@ test('explicit shebang', function (t) {
             "\n")
 
     t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
-            "@IF EXIST \"%~dp0\\/usr/bin/sh.exe\" (\r" +
-            "\n  \"%~dp0\\/usr/bin/sh.exe\"  \"%~dp0\\from.sh\" %*\r" +
+            resolveDir +
+            "@IF EXIST \"%dir%\\/usr/bin/sh.exe\" (\r" +
+            "\n  \"%dir%\\/usr/bin/sh.exe\"  \"%dir%\\from.sh\" %*\r" +
             "\n) ELSE (\r" +
             "\n  @SETLOCAL\r"+
             "\n  @SET PATHEXT=%PATHEXT:;.JS;=;%\r"+
-            "\n  /usr/bin/sh  \"%~dp0\\from.sh\" %*\r" +
+            "\n  /usr/bin/sh  \"%dir%\\from.sh\" %*\r" +
             "\n)")
     t.end()
   })
@@ -163,12 +172,13 @@ test('explicit shebang with args', function (t) {
             "\n")
 
     t.equal(fs.readFileSync(to + '.cmd', 'utf8'),
-            "@IF EXIST \"%~dp0\\/usr/bin/sh.exe\" (\r" +
-            "\n  \"%~dp0\\/usr/bin/sh.exe\"  -x \"%~dp0\\from.sh.args\" %*\r" +
+            resolveDir +
+            "@IF EXIST \"%dir%\\/usr/bin/sh.exe\" (\r" +
+            "\n  \"%dir%\\/usr/bin/sh.exe\"  -x \"%dir%\\from.sh.args\" %*\r" +
             "\n) ELSE (\r" +
             "\n  @SETLOCAL\r"+
             "\n  @SET PATHEXT=%PATHEXT:;.JS;=;%\r"+
-            "\n  /usr/bin/sh  -x \"%~dp0\\from.sh.args\" %*\r" +
+            "\n  /usr/bin/sh  -x \"%dir%\\from.sh.args\" %*\r" +
             "\n)")
     t.end()
   })