Improved correctness of target binding at shimming point.

ScoopInstaller · Mar 10, 2018 · b9850fa · b9850fa
1 parent 56a7af4
commit b9850fa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/core.ps1 b/lib/core.ps1
@@ -272,7 +272,7 @@ powershell -noprofile -ex unrestricted `"& '$resolved_path' %args%;exit `$lastex
 function search_in_path($target) {
     $path = (env 'PATH' $false) + ";" + (env 'PATH' $true)
     $path.split(';') | % {
-        if(test-path "$_\$target") {
+        if(test-path "$_\$target" -pathType leaf) {
             return "$_\$target"
         }
     }

diff --git a/lib/install.ps1 b/lib/install.ps1
@@ -679,14 +679,14 @@ function create_shims($manifest, $dir, $global, $arch) {
         $target, $name, $arg = shim_def $_
         write-output "Creating shim for '$name'."
 
-        if(test-path "$dir\$target") {
+        if(test-path "$dir\$target" -pathType leaf) {
             $bin = "$dir\$target"
-        } elseif(test-path $target) {
+        } elseif(test-path $target -pathType leaf) {
             $bin = $target
         } else {
             $bin = search_in_path $target
         }
-        if(!(test-path $bin)) { abort "Can't shim '$target': File doesn't exist."}
+        if(!$bin) { abort "Can't shim '$target': File doesn't exist."}
 
         shim $bin $global $name (substitute $arg @{ '$dir' = $dir; '$original_dir' = $original_dir; '$persist_dir' = $persist_dir})
     }