diff options
author | isaacs <i@izs.me> | 2012-02-16 04:38:52 +0400 |
---|---|---|
committer | isaacs <i@izs.me> | 2012-02-16 04:58:41 +0400 |
commit | 391e7d04c906647c6bf734d066dd62ead5286c87 (patch) | |
tree | 7f4a694fedfd78b79f0402b8f2abce274b72be15 | |
parent | 1b2635ab3103ff18687e6fdb1b31f2755c36d338 (diff) |
Simplify confusing windows paths
-rw-r--r-- | bin/npm.cmd | 8 | ||||
-rw-r--r-- | lib/utils/cmd-shim.js | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/npm.cmd b/bin/npm.cmd index bac9e5f1c..7720e2052 100644 --- a/bin/npm.cmd +++ b/bin/npm.cmd @@ -1,6 +1,6 @@ :: Created by npm, please don't edit manually.
-@IF EXIST "%~dp0"\"node.exe" (
- "%~dp0"\"node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+@IF EXIST "%~dp0\node.exe" (
+ "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
) ELSE (
- node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
-)
\ No newline at end of file + node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %*
+)
diff --git a/lib/utils/cmd-shim.js b/lib/utils/cmd-shim.js index a7892e8ee..f53ab3cf8 100644 --- a/lib/utils/cmd-shim.js +++ b/lib/utils/cmd-shim.js @@ -73,16 +73,16 @@ function writeShim_ (from, to, prog, args, cb) { target = "" shTarget = "" } else { - longProg = "\"%~dp0\"\\\"" + prog + ".exe\"" + longProg = "\"%~dp0\\" + prog + ".exe\"" shLongProg = "\"`dirname \"$0\"`/" + prog + "\"" target = "\"%~dp0\\" + target + "\"" shTarget = "\"`dirname \"$0\"`/" + shTarget + "\"" } - // @IF EXIST "%~dp0"\"node.exe" ( + // @IF EXIST "%~dp0\node.exe" ( // "%~dp0\node.exe" "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* // ) ELSE ( - // node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* + // node "%~dp0\.\node_modules\npm\bin\npm-cli.js" %* // ) var cmd if (longProg) { |