(chocolatey#2112) Change additionalInstallArgs match logic

This streamlines the check to use a Regex Or ('|') rather than multiple '-or' clauses. This will be _slightly_ faster, and maintains readability for maintainers/contributors.
steviecoaster · Apr 20, 2021 · a365a87 · a365a87
1 parent f0d40e4
commit a365a87
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1 b/src/chocolatey.resources/helpers/functions/Install-ChocolateyInstallPackage.ps1
@@ -261,11 +261,15 @@ Start-ChocolateyProcessAsAdmin
     $additionalInstallArgs = '';
   }
   else {
-    if ($additionalInstallArgs -match 'INSTALLDIR' -or `
-        $additionalInstallArgs -match 'TARGETDIR' -or `
-        $additionalInstallArgs -match 'dir\=' -or `
-        $additionalInstallArgs -match '\/D\='
-    ) {
+    #Use a Regex Or ('|') to do the match, instead of multiple '-or' clauses
+    $argPattern = @(
+      'INSTALLDIR'
+      'TARGETDIR'
+      'dir\='
+      '\/D\='
+  ) -join '|'
+
+    if ($additionalInstallArgs -match $argPattern) {
       @"
 Pro / Business supports a single, ubiquitous install directory option.
  Stop the hassle of determining how to pass install directory overrides