Moved error handling

Author: raandree

AutomatedLab.Common/Common/Public/Install-SoftwarePackage.ps1

@@ -32,17 +32,6 @@ function Install-SoftwarePackage
             [string]$WorkingDirectory
         )
 
-        #if the path cannot be found and starts with \\automatedlabsources...
-        if ((-not (Test-Path -Path $Path) -and $Path -match '\\\\automatedlabsources[a-z]{5}\.file\.core\.windows\.net'))
-        {
-            #we assume, the LabSources share was not mapped correctly and try again by calling 'C:\AL\AzureLabSources.ps1'
-            $labSourcesConnectOutput = C:\AL\AzureLabSources.ps1
-            if ($labSourcesConnectOutput.AlternativeLabSourcesPath)
-            {
-                $Path = $Path.Replace($labSourcesConnectOutput.LabSourcesPath, $labSourcesConnectOutput.AlternativeLabSourcesPath)
-            }
-        }
-
         $pInfo = New-Object -TypeName System.Diagnostics.ProcessStartInfo
         $pInfo.FileName = $Path
         if (-not [string]::IsNullOrWhiteSpace($WorkingDirectory)) { $pInfo.WorkingDirectory = $WorkingDirectory }
@@ -76,6 +65,17 @@ function Install-SoftwarePackage
     }
     #endregion New-InstallProcess
 
+    #if the path cannot be found and starts with \\automatedlabsources...
+    if ((-not (Test-Path -Path $Path) -and $Path -match '\\automatedlabsources[a-z]{5}\.file\.core\.windows\.net'))
+    {
+        #we assume, the LabSources share was not mapped correctly and try again by calling 'C:\AL\AzureLabSources.ps1'
+        $labSourcesConnectOutput = C:\AL\AzureLabSources.ps1 2> $null
+        if ($labSourcesConnectOutput.AlternativeLabSourcesPath)
+        {
+            $Path = $Path.Replace($labSourcesConnectOutput.LabSourcesPath, $labSourcesConnectOutput.AlternativeLabSourcesPath)
+        }
+    }
+
     if (-not (Test-Path -Path $Path -PathType Leaf))
     {
         Write-Error "The file '$Path' could not found"