is_in_dir: return true for checking if a directory is 'in' itself

lukesampson · lukesampson · commit ac8a156796cb · 2013-11-12T09:28:20.000+10:00
diff --git a/lib/install.ps1 b/lib/install.ps1
@@ -156,10 +156,10 @@ function dl_urls($app, $version, $manifest, $architecture, $dir) {
 	$fname # returns the last downloaded file
 }
 
-function is_in_dir($dir, $file) {
-	$file = "$(fullpath $file)"
+function is_in_dir($dir, $check) {
+	$check = "$(fullpath $check)"
 	$dir = "$(fullpath $dir)"
-	$file -match "^$([regex]::escape("$dir\"))"
+	$check -match "^$([regex]::escape("$dir"))(\\|`$)"
 }
 
 # hashes

Original file line number	Diff line number	Diff line change
`@@ -156,10 +156,10 @@ function dl_urls($app, $version, $manifest, $architecture, $dir) {`
`156`	`156`	`$fname # returns the last downloaded file`
`157`	`157`	`}`
`158`	`158`
`159`		`-function is_in_dir($dir, $file) {`
`160`		`- $file = "$(fullpath $file)"`
	`159`	`+function is_in_dir($dir, $check) {`
	`160`	`+ $check = "$(fullpath $check)"`
`161`	`161`	`$dir = "$(fullpath $dir)"`
`162`		`- $file -match "^$([regex]::escape("$dir\"))"`
	`162`	+ $check -match "^$([regex]::escape("$dir"))(\\\|`$)"
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`# hashes`