GH-66 & GH-67

RWS · Apr 26, 2017 · 10c0f6a · 10c0f6a
1 parent 9a49d65
commit 10c0f6a
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/Source/Invoke-PackerBuild.ps1 b/Source/Invoke-PackerBuild.ps1
@@ -211,12 +211,12 @@ try
     if ($PSCmdlet.ShouldProcess($packerFileName, "packer build")){
         $invokedPacker=$true
         $env:PACKER_LOG=1
-        $packetLogPath=Join-Path $env:TEMP "$($packerFileName).txt"
-        if(Test-Path -Path $packetLogPath)
+        $packerLogPath=Join-Path $env:TEMP "$($packerFileName).$ISHVersion.txt"
+        if(Test-Path -Path $packerLogPath)
         {
-            Remove-Item -Path $packetLogPath -Force
+            Remove-Item -Path $packerLogPath -Force
         }
-        $env:PACKER_LOG_PATH=$packetLogPath
+        $env:PACKER_LOG_PATH=$packerLogPath
         Write-Host "packer $packerArgs"
         & packer $packerArgs
         Write-Host "LASTEXITCODE=$LASTEXITCODE"
@@ -230,21 +230,21 @@ finally
 {
     if($invokedPacker)
     {
-        Write-Warning "Packer log file available in $packetLogPath"
+        Write-Warning "Packer log file available in $packerLogPath"
         Pop-Location -StackName Packer
 
         if($LASTEXITCODE -ne 0)
         {
             if($logRegExSource)
             {
-                $packerLogContent=Get-Content -Path  $packetLogPath -Raw
+                $packerLogContent=Get-Content -Path  $packerLogPath -Raw
                 $regex=".*$($logRegExSource): (?<Objs>\<Objs.*\</Objs\>).*"
                 $matchCollections=[regex]::Matches($packerLogContent,$regex)
                 if($matchCollections.Count -gt 0)
                 {
                     Write-Warning "Packer Objs xml entries available:"
                     for($i=0;$i -lt $matchCollections.Count;$i++) {
-                        $objsItemPath=$packetLogPath.Replace(".txt",".$i.xml")
+                        $objsItemPath=$packerLogPath.Replace(".txt",".$i.xml")
                         $matchCollections[$i].Groups['Objs'].Value | Format-TidyXml | Out-File -FilePath $objsItemPath
                         Write-Warning $objsItemPath
                     }