Merge pull request KelvinTegelaar#1658 from PeterVive/custom-chocolatey-arguments

Implement custom chocolatey arguments. #4683

Author: JohnDuprey

AddChocoApp/Choco.App.xml

@@ -1,15 +1,15 @@
 <ApplicationInfo xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ToolVersion="1.8.3.0">
-  <Name>Install.ps1</Name>
-  <UnencryptedContentSize>28319</UnencryptedContentSize>
+  <Name>install.ps1</Name>
+  <UnencryptedContentSize>1154</UnencryptedContentSize>
   <FileName>IntunePackage.intunewin</FileName>
-  <SetupFile>Install.ps1</SetupFile>
+  <SetupFile>install.ps1</SetupFile>
   <EncryptionInfo>
-    <EncryptionKey>bmoyHXFtIws7JrnXNDV4rjzap+Be+4ZJEDJkTfbVIL8=</EncryptionKey>
-    <MacKey>xNh8ZUZ6TLsAtihUEAU/NHiRfutDzz+eSgEdpaXUo9Q=</MacKey>
-    <InitializationVector>3aQFPhO8ywEC4Ojby1lR0w==</InitializationVector>
-    <Mac>PXX+hj3DXEpzMEMYBDXmAIlSyDIGuAwmAHIQpZIt8hU=</Mac>
+    <EncryptionKey>v8i9okyqxp8xlw3/r2QXMNnXcuGwrBkD54QQ7F/UJbc=</EncryptionKey>
+    <MacKey>XjT9kWc7gQRKRdEQ/PA/lbQDDH8kFjnuPFILxAldRTI=</MacKey>
+    <InitializationVector>iyAbM3kIYqA4AlWP89S5oA==</InitializationVector>
+    <Mac>w+2KMctRWmJzYjKcMTAKCLz15K559SgZ3pnQuQD3P/I=</Mac>
     <ProfileIdentifier>ProfileVersion1</ProfileIdentifier>
-    <FileDigest>fx41h3rGZYZO3Jux7JnPgatlmpMc2ZFIZS8ipF5VDDw=</FileDigest>
+    <FileDigest>tyjBbJZ+Zj9AqD7UjEfQfe/HojN/q1+zFPidXWbiVuE=</FileDigest>
     <FileDigestAlgorithm>SHA256</FileDigestAlgorithm>
   </EncryptionInfo>
 </ApplicationInfo>

AddChocoApp/IntunePackage.intunewin

@@ -12,6 +12,10 @@ param (
     [string]
     $CustomRepo,
 
+    [Parameter()]
+    [string]
+    $CustomArguments,
+
     [Parameter()]
     [switch]
     $Trace
@@ -36,13 +40,23 @@ try {
     try {
         $localprograms = & "$chocoPath" list --localonly
         $CustomRepoString = if ($CustomRepo) { "--source $customrepo" } else { $null }
+        $CustomArgsArray = if ($CustomArguments) { $CustomArguments -split '\s+' } else { @() }
+        
         if ($localprograms -like "*$Packagename*" ) {
             Write-Host "Upgrading $packagename"
-            & "$chocoPath" upgrade $Packagename $CustomRepoString
+            if ($CustomArgsArray.Count -gt 0) {
+                & "$chocoPath" upgrade $Packagename $CustomRepoString $CustomArgsArray
+            } else {
+                & "$chocoPath" upgrade $Packagename $CustomRepoString
+            }
         }
         else {
             Write-Host "Installing $packagename"
-            & "$chocoPath" install $Packagename -y $CustomRepoString
+            if ($CustomArgsArray.Count -gt 0) {
+                & "$chocoPath" install $Packagename -y $CustomRepoString $CustomArgsArray
+            } else {
+                & "$chocoPath" install $Packagename -y $CustomRepoString
+            }
         }
         Write-Host 'Completed.'
     }

AddChocoApp/IntunePackage/Install.ps1

@@ -25,19 +25,28 @@ Function Invoke-AddChocoApp {
     if ($ChocoApp.customrepo) {
         $intuneBody.installCommandLine = $intuneBody.installCommandLine + " -CustomRepo $($ChocoApp.CustomRepo)"
     }
+    if ($ChocoApp.customArguments) {
+        $intuneBody.installCommandLine = $intuneBody.installCommandLine + " -CustomArguments '$($ChocoApp.customArguments)'"
+    }
     $intuneBody.UninstallCommandLine = "powershell.exe -ExecutionPolicy Bypass .\Uninstall.ps1 -Packagename $($ChocoApp.PackageName)"
     $intuneBody.detectionRules[0].path = "$($ENV:SystemDrive)\programdata\chocolatey\lib"
     $intuneBody.detectionRules[0].fileOrFolderName = "$($ChocoApp.PackageName)"
 
     $Tenants = $Request.Body.selectedTenants.defaultDomainName
     $Results = foreach ($Tenant in $Tenants) {
         try {
+            # Apply CIPP text replacement for tenant-specific variables
+            $TenantIntuneBody = $intuneBody | ConvertTo-Json -Depth 15 | ConvertFrom-Json
+            if ($TenantIntuneBody.installCommandLine -match '%') {
+                $TenantIntuneBody.installCommandLine = Get-CIPPTextReplacement -TenantFilter $Tenant -Text $TenantIntuneBody.installCommandLine
+            }
+            
             $CompleteObject = [PSCustomObject]@{
                 tenant             = $Tenant
                 ApplicationName    = $ChocoApp.ApplicationName
                 assignTo           = $AssignTo
                 InstallationIntent = $Request.Body.InstallationIntent
-                IntuneBody         = $intuneBody
+                IntuneBody         = $TenantIntuneBody
             } | ConvertTo-Json -Depth 15
             $Table = Get-CippTable -tablename 'apps'
             $Table.Force = $true