Merge pull request #143 from aaronparker/development

Fix Import-VcConfigMgrApplication
aaronparker · Oct 2, 2023 · dbb8fff · dbb8fff
2 parents e4332b1 + 4317f52
commit dbb8fff
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 15 deletions.
diff --git a/VcRedist/Public/Import-VcConfigMgrApplication.ps1 b/VcRedist/Public/Import-VcConfigMgrApplication.ps1
@@ -84,7 +84,7 @@ function Import-VcConfigMgrApplication {
                 $DestCmFolder = "$($SMSSiteCode):\Application\$($AppFolder)"
                 if ($PSCmdlet.ShouldProcess($DestCmFolder, "Creating")) {
                     Write-Verbose -Message "Creating: $DestCmFolder."
-                    New-Item -Path $DestCmFolder -ErrorAction "Continue" > $null
+                    New-Item -Path $DestCmFolder -ErrorAction "SilentlyContinue" | Out-Null
                 }
             }
             else {
@@ -122,18 +122,19 @@ function Import-VcConfigMgrApplication {
                         $ContentLocation = [System.IO.Path]::Combine($CMPath, $VcRedist.Release, $VcRedist.Version, $VcRedist.Architecture)
 
                         #region Copy VcRedists to the network location. Use robocopy for robustness
-                        if ($PSBoundParameters.Contains($NoCopy)) {
+                        if ($PSBoundParameters.ContainsKey($NoCopy)) {
                             Write-Warning -Message "NoCopy specified, skipping copy to $ContentLocation. Ensure VcRedists exist in the target."
                         }
                         else {
                             if ($PSCmdlet.ShouldProcess("'$($VcRedist.Path)' to '$($ContentLocation)'", "Copy")) {
                                 if (!(Test-Path -Path $ContentLocation)) {
-                                    New-Item -Path $ContentLocation -ItemType "Directory" -ErrorAction "Continue" > $null
+                                    New-Item -Path $ContentLocation -ItemType "Directory" -ErrorAction "SilentlyContinue" | Out-Null
                                 }
+
                                 try {
                                     $invokeProcessParams = @{
                                         FilePath     = "$env:SystemRoot\System32\robocopy.exe"
-                                        ArgumentList = "$(Split-Path -Path $VcRedist.Path -Leaf) `"$SourceFolder`" `"$ContentLocation`" /S /XJ /R:1 /W:1 /NP /NJH /NJS /NFL /NDL"
+                                        ArgumentList = "`"$SourceFolder`" `"$ContentLocation`" `"$(Split-Path -Path $VcRedist.Path -Leaf)`" /S /XJ /R:1 /W:1 /NP /NJH /NJS /NFL /NDL"
                                     }
                                     Invoke-Process @invokeProcessParams | Out-Null
                                 }
@@ -145,7 +146,7 @@ function Import-VcConfigMgrApplication {
                                     }
                                     else {
                                         Write-Warning -Message "Failed to copy Redistributables from '$($VcRedist.Path)' to '$ContentLocation'."
-                                        throw $Err
+                                        Write-Warning -Message $Err.Exception.Message
                                     }
                                 }
                             }
@@ -155,11 +156,12 @@ function Import-VcConfigMgrApplication {
                         # Change to the SMS Application folder before importing the applications
                         try {
                             Write-Verbose -Message "Setting location to: $DestCmFolder"
-                            Set-Location -Path $DestCmFolder -ErrorAction "Continue"
+                            Push-Location -Path $DestCmFolder -ErrorAction "Continue"
                         }
                         catch [System.Exception] {
+                            Pop-Location
                             Write-Warning -Message "Failed to set location to: $DestCmFolder."
-                            throw $_
+                            Write-Warning -Message $_.Exception.Message
                         }
 
                         try {
@@ -178,12 +180,13 @@ function Import-VcConfigMgrApplication {
                             }
                             $app = New-CMApplication @cmAppParams
                             if ($AppFolder) {
-                                $app | Move-CMObject -FolderPath $DestCmFolder -ErrorAction "SilentlyContinue" > $null
+                                $app | Move-CMObject -FolderPath $DestCmFolder -ErrorAction "SilentlyContinue" | Out-Null
                             }
                         }
                         catch [System.Exception] {
+                            Pop-Location
                             Write-Warning -Message "Failed to create application $($VcRedist.Name) $($VcRedist.Architecture)."
-                            throw $_
+                            Write-Warning -Message $_.Exception.Message
                         }
                         # Write app detail to the pipeline
                         Write-Output -InputObject $app
@@ -195,11 +198,12 @@ function Import-VcConfigMgrApplication {
                         # Change to the SMS Application folder before importing the applications
                         try {
                             Write-Verbose -Message "Set location to: $DestCmFolder"
-                            Set-Location -Path $DestCmFolder -ErrorAction "Continue"
+                            Push-Location -Path $DestCmFolder -ErrorAction "Continue"
                         }
                         catch [System.Exception] {
+                            Pop-Location
                             Write-Warning -Message "Failed to set location to: $DestCmFolder."
-                            throw $_
+                            Write-Warning -Message $_.Exception.Message
                         }
 
                         try {
@@ -224,11 +228,12 @@ function Import-VcConfigMgrApplication {
                                 InstallationBehaviorType = "InstallForSystem"
                                 Comment                  = "Generated by $($MyInvocation.MyCommand). https://vcredist.com"
                             }
-                            Add-CMScriptDeploymentType @cmScriptParams > $null
+                            Add-CMScriptDeploymentType @cmScriptParams | Out-Null
                         }
                         catch [System.Exception] {
+                            Pop-Location
                             Write-Warning -Message "Failed to add script deployment type."
-                            throw $_
+                            Write-Warning -Message $_.Exception.Message
                         }
                     }
                 }
@@ -237,5 +242,6 @@ function Import-VcConfigMgrApplication {
     }
 
     end {
+        Pop-Location
     }
 }
diff --git a/VcRedist/VcRedist.psd1 b/VcRedist/VcRedist.psd1
@@ -1,4 +1,4 @@
-#
+#
 # Module manifest for module 'VcRedist'
 #
 # Generated by: Aaron Parker
@@ -12,7 +12,7 @@
 RootModule = 'VcRedist.psm1'
 
 # Version number of this module.
-ModuleVersion = '4.1.484'
+ModuleVersion = '4.1.485'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## VERSION
+
+* Fixes an issue with `Import-VcConfigMgrApplication` [#142](https://github.com/aaronparker/vcredist/issues/142) [#96](https://github.com/aaronparker/vcredist/issues/96)
+
 ## 4.1.482
 
 * Change `MinimumRequiredOperatingSystem` default value to `W10_1809` due to change in Intune expected valued [#132](https://github.com/aaronparker/vcredist/issues/132)