Fix error 2

Author: KnifMelti

Sources/Winget-AutoUpdate/Winget-Install.ps1

@@ -101,7 +101,13 @@ function Test-ModsInstall ($AppID) {
             $ModsCustom = (Get-Content "$Mods\$AppID-custom.txt" -Raw).Trim()
         }
         if (Test-Path "$Mods\$AppID-arguments.txt") {
-            $ModsArguments = (Get-Content "$Mods\$AppID-arguments.txt" -Raw).Trim()
+            # Read file and filter out comments and empty lines
+            $lines = Get-Content "$Mods\$AppID-arguments.txt" | Where-Object { 
+                $_.Trim() -ne "" -and -not $_.TrimStart().StartsWith("#") 
+            }
+            if ($lines) {
+                $ModsArguments = ($lines -join " ").Trim()
+            }
         }
         if (Test-Path "$Mods\$AppID-install.ps1") {
             $ModsInstall = "$Mods\$AppID-install.ps1"
@@ -160,7 +166,7 @@ function Install-App ($AppID, $AppArgs) {
         }
         elseif ($ModsArguments) {
             Write-ToLog "-> Arguments (winget-level): $ModsArguments" # Winget parameters with -h
-            $argArray = Parse-WingetArguments $ModsArguments
+            $argArray = ConvertTo-WingetArgumentArray $ModsArguments
             $WingetArgs = @("install", "--id", $AppID, "-e", "--accept-package-agreements", "--accept-source-agreements", "-s", "winget") + $argArray + @("-h") + @($AppArgs -split " ")
         }
         else {

Sources/Winget-AutoUpdate/functions/ConvertTo-WingetArgumentArray.ps1

@@ -14,18 +14,18 @@
     Array of individual argument strings
 
 .EXAMPLE
-    Parse-WingetArguments "--skip-dependencies"
+    ConvertTo-WingetArgumentArray "--skip-dependencies"
     Returns: @("--skip-dependencies")
 
 .EXAMPLE
-    Parse-WingetArguments '--locale "en-US" --architecture x64'
+    ConvertTo-WingetArgumentArray '--locale "en-US" --architecture x64'
     Returns: @("--locale", "en-US", "--architecture", "x64")
 
 .EXAMPLE
-    Parse-WingetArguments "--override '-sfx_nu /sAll /msi EULA_ACCEPT=YES'"
+    ConvertTo-WingetArgumentArray "--override '-sfx_nu /sAll /msi EULA_ACCEPT=YES'"
     Returns: @("--override", "-sfx_nu /sAll /msi EULA_ACCEPT=YES")
 #>
-function Parse-WingetArguments {
+function ConvertTo-WingetArgumentArray {
     [CmdletBinding()]
     [OutputType([string[]])]
     param(
@@ -51,10 +51,12 @@ function Parse-WingetArguments {
     $pattern = '(?:"([^"]*)"|''([^'']*)''|(\S+))'
 
     try {
-        $matches = [regex]::Matches($ArgumentString, $pattern)
+        # Use [regex]::Matches() to find all argument tokens
+        $regex = [regex]::new($pattern)
+        $regexMatches = $regex.Matches($ArgumentString)
 
         $result = @()
-        foreach ($match in $matches) {
+        foreach ($match in $regexMatches) {
             # Get the captured value from whichever group matched
             $value = if ($match.Groups[1].Success) { 
                 # Double-quoted value
@@ -82,6 +84,7 @@ function Parse-WingetArguments {
         Write-ToLog "Falling back to simple space split" "Yellow"
 
         # Fallback to simple split if regex parsing fails
-        return $ArgumentString.Trim() -split '\s+'
+        $fallbackResult = $ArgumentString.Trim() -split '\s+'
+        return $fallbackResult
     }
 }

Sources/Winget-AutoUpdate/functions/Test-Mods.ps1

@@ -36,7 +36,15 @@ function Test-Mods ($app) {
         if (Test-Path "$Mods\$app-preinstall.ps1") { $result.PreInstall = "$Mods\$app-preinstall.ps1" }
         if (Test-Path "$Mods\$app-override.txt") { $result.Override = (Get-Content "$Mods\$app-override.txt" -Raw).Trim() }
         if (Test-Path "$Mods\$app-custom.txt") { $result.Custom = (Get-Content "$Mods\$app-custom.txt" -Raw).Trim() }
-        if (Test-Path "$Mods\$app-arguments.txt") { $result.Arguments = (Get-Content "$Mods\$app-arguments.txt" -Raw).Trim() }
+        if (Test-Path "$Mods\$app-arguments.txt") { 
+            # Read file and filter out comments and empty lines
+            $lines = Get-Content "$Mods\$app-arguments.txt" | Where-Object { 
+                $_.Trim() -ne "" -and -not $_.TrimStart().StartsWith("#") 
+            }
+            if ($lines) {
+                $result.Arguments = ($lines -join " ").Trim()
+            }
+        }
         if (Test-Path "$Mods\$app-install.ps1") {
             $result.Install = "$Mods\$app-install.ps1"
             $result.Upgrade = "$Mods\$app-install.ps1"

Sources/Winget-AutoUpdate/functions/Update-App.ps1

@@ -24,7 +24,7 @@ Function Update-App ($app) {
         }
         elseif ($ModsArguments) {
             # Parse arguments respecting quotes and spaces
-            $argArray = Parse-WingetArguments $ModsArguments
+            $argArray = ConvertTo-WingetArgumentArray $ModsArguments
             return @{ Params = $params + $argArray + "-h"; Log = "$Command (arguments): $ModsArguments" }
         }
         return @{ Params = $params + "-h"; Log = $Command }