Support %dp0% as well as %~dp0

isaacs · isaacs · commit 03db57360e75 · 2019-08-14T12:10:27.000-07:00
We have to set the base dir in a subroutine to fix npm/cmd-shim#10
diff --git a/index.js b/index.js
@@ -10,7 +10,7 @@ function extractPath (path, cmdshimContents) {
 }
 
 function extractPathFromCmd (cmdshimContents) {
-  var matches = cmdshimContents.match(/"%~dp0\\([^"]+?)"\s+%[*]/)
+  var matches = cmdshimContents.match(/"%(?:~dp0|dp0%)\\([^"]+?)"\s+%[*]/)
   return matches && matches[1]
 }
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ function extractPath (path, cmdshimContents) {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`function extractPathFromCmd (cmdshimContents) {`
`13`		`- var matches = cmdshimContents.match(/"%~dp0\\([^"]+?)"\s+%[*]/)`
	`13`	`+ var matches = cmdshimContents.match(/"%(?:~dp0\|dp0%)\\([^"]+?)"\s+%[*]/)`
`14`	`14`	`return matches && matches[1]`
`15`	`15`	`}`
`16`	`16`