Second try to fix issue psget#12, module not from child directory

chaliy · Feb 5, 2012 · 0267d7e · 0267d7e
1 parent 9ffcbdf
commit 0267d7e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/PsGet/PsGet.psm1 b/PsGet/PsGet.psm1
@@ -95,7 +95,7 @@ Param(
             # Let’s try guessing module name
             if ($ModuleName -eq ""){
                 $BestCandidateModule = (Get-ChildItem $TempModuleFolderPath -Filter "*.psm1" -Recurse  -File |
-                        Sort-Object DirectoryName.Length -Desc |
+                        Sort-Object DirectoryName.Length -Desc | # Sort by folder length ensures that we use one from root folder(Issue #12)
                         Select-Object -Index 0).FullName
                 $ModuleName = [IO.Path]::GetFileNameWithoutExtension($BestCandidateModule)
             }
@@ -379,7 +379,9 @@ Param(
     }    
 
     if ($ModuleName -eq ""){
-        $BestCandidateModule = (Get-ChildItem $TempModuleFolderPath -Filter "*.psm1" -Recurse | select -Index 0).FullName
+        $BestCandidateModule = (Get-ChildItem $TempModuleFolderPath -Filter "*.psm1" -Recurse -File |
+            Sort-Object DirectoryName.Lenght -Desc | # Sort by folder length ensures that we use one from root folder(Issue #12)
+            Select-Object -Index 0).FullName
         $ModuleName = [IO.Path]::GetFileNameWithoutExtension($BestCandidateModule)
     }