issue #3507 (#3508)

freddydk · web-flow · commit de974c89e632 · 2024-04-24T15:59:50.000+02:00
#3507 Co-authored-by: freddydk <freddydk@users.noreply.github.com>
diff --git a/ContainerHandling/Invoke-ScriptInNavContainer.ps1 b/ContainerHandling/Invoke-ScriptInNavContainer.ps1
@@ -30,9 +30,10 @@ function Invoke-ScriptInBcContainer {
         [bool] $usePwsh = $bccontainerHelperConfig.usePwshForBc24
     )
 
+    $file = ''
     if (!$useSession) {
         $file = Join-Path $bcContainerHelperConfig.hostHelperFolder ([GUID]::NewGuid().Tostring()+'.ps1')
-        $containerFile = $containerFile = Get-BcContainerPath -containerName $containerName -path $file
+        $containerFile = Get-BcContainerPath -containerName $containerName -path $file
         if ($isInsideContainer -or "$containerFile" -eq "") {
             $useSession = $true
         }
@@ -111,6 +112,10 @@ function Invoke-ScriptInBcContainer {
             throw $errorMessage
         }
     } else {
+        if ($file -eq '') {
+            $file = Join-Path $bcContainerHelperConfig.hostHelperFolder ([GUID]::NewGuid().Tostring()+'.ps1')
+            $containerFile = Get-BcContainerPath -containerName $containerName -path $file
+        }
         if ("$containerFile" -eq "") {
             throw "$($bcContainerHelperConfig.hostHelperFolder) is not shared with the container, cannot invoke scripts in container without using a session"
         }

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,10 @@ function Invoke-ScriptInBcContainer {`
`30`	`30`	`[bool] $usePwsh = $bccontainerHelperConfig.usePwshForBc24`
`31`	`31`	`)`
`32`	`32`
	`33`	`+ $file = ''`
`33`	`34`	`if (!$useSession) {`
`34`	`35`	`$file = Join-Path $bcContainerHelperConfig.hostHelperFolder ([GUID]::NewGuid().Tostring()+'.ps1')`
`35`		`- $containerFile = $containerFile = Get-BcContainerPath -containerName $containerName -path $file`
	`36`	`+ $containerFile = Get-BcContainerPath -containerName $containerName -path $file`
`36`	`37`	`if ($isInsideContainer -or "$containerFile" -eq "") {`
`37`	`38`	`$useSession = $true`
`38`	`39`	`}`
`@@ -111,6 +112,10 @@ function Invoke-ScriptInBcContainer {`
`111`	`112`	`throw $errorMessage`
`112`	`113`	`}`
`113`	`114`	`} else {`
	`115`	`+ if ($file -eq '') {`
	`116`	`+ $file = Join-Path $bcContainerHelperConfig.hostHelperFolder ([GUID]::NewGuid().Tostring()+'.ps1')`
	`117`	`+ $containerFile = Get-BcContainerPath -containerName $containerName -path $file`
	`118`	`+ }`
`114`	`119`	`if ("$containerFile" -eq "") {`
`115`	`120`	`throw "$($bcContainerHelperConfig.hostHelperFolder) is not shared with the container, cannot invoke scripts in container without using a session"`
`116`	`121`	`}`