use regex to properly get package files for local repos especially on…

… Linux
PowerShell · Oct 11, 2024 · 843211b · 843211b
1 parent 78a0cf6
commit 843211b
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/src/code/LocalServerApiCalls.cs b/src/code/LocalServerApiCalls.cs
@@ -652,13 +652,15 @@ private Hashtable GetMetadataFromNupkg(string packageName, string packagePath, s
                 var currentFiles = Directory.GetFiles(tempDiscoveryPath);
 
                 string psd1FilePath = String.Empty;
+                string ps1FilePath = String.Empty;
                 string nuspecFilePath = String.Empty;
                 string pkgNamePattern = $"{packageName}*";
                 Regex rgx = new(pkgNamePattern, RegexOptions.IgnoreCase);
                 foreach (var x in currentFiles)
                 {
                     if (rgx.IsMatch(x))
                     {
+                        _cmdletPassedIn.WriteVerbose("file is a match: " + x);
                         if (x.EndsWith("psd1"))
                         {
                             psd1FilePath = x;
@@ -667,15 +669,13 @@ private Hashtable GetMetadataFromNupkg(string packageName, string packagePath, s
                         {
                             nuspecFilePath = x;
                         }
+                        else if (x.EndsWith("ps1"))
+                        {
+                            ps1FilePath = x;
+                        }
                     }
-                    _cmdletPassedIn.WriteVerbose($"file found: " + x);
-
-                }
 
-                foreach (var x in currentFiles)
-                {
                     _cmdletPassedIn.WriteVerbose($"file found: " + x);
-
                 }
 
                 var files = Directory.EnumerateFiles(tempDiscoveryPath, "*.*", SearchOption.AllDirectories).Where(
@@ -688,7 +688,7 @@ private Hashtable GetMetadataFromNupkg(string packageName, string packagePath, s
                 }
 
                 // string psd1FilePath = Path.Combine(tempDiscoveryPath, $"{packageName}.psd1");
-                string ps1FilePath = Path.Combine(tempDiscoveryPath, $"{packageName}.ps1");
+                // string ps1FilePath = Path.Combine(tempDiscoveryPath, $"{packageName}.ps1");
                 // string nuspecFilePath = Path.Combine(tempDiscoveryPath, $"{packageName}.nuspec");
 
                 List<string> pkgTags = new List<string>();