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

ScoopInstaller · Nov 11, 2013 · ac8a156 · ac8a156
1 parent a572724
commit ac8a156
Showing 1 changed file with 3 additions and 3 deletions.
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