From bc29278c42c093e24a916db830a83b0e520bef26 Mon Sep 17 00:00:00 2001 From: Elon Mallin Date: Thu, 9 Nov 2023 22:39:10 +0000 Subject: [PATCH] fix(powershell): make sure paths exists when building and importing module --- .../src/main/resources/powershell/Build.ps1.mustache | 4 +++- .../main/resources/powershell/Org.OpenAPITools.psm1.mustache | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache b/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache index 6fed374afbd..be74a118037 100644 --- a/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache +++ b/modules/openapi-generator/src/main/resources/powershell/Build.ps1.mustache @@ -39,7 +39,9 @@ function Get-FunctionsToExport { } $ScriptDir = Split-Path $script:MyInvocation.MyCommand.Path -$FunctionPath = 'Api', 'Model', 'Client' | ForEach-Object {Join-Path "$ScriptDir\src\{{{packageName}}}\" $_} +$FunctionPath = 'Api', 'Model', 'Client' | Where-Object { + Join-Path "$ScriptDir\src\{{{packageName}}}\" $_ | Test-Path +} | ForEach-Object { Join-Path "$ScriptDir\src\{{{packageName}}}\" $_ } $Manifest = @{ Path = "$ScriptDir\src\{{{packageName}}}\{{{packageName}}}.psd1" diff --git a/modules/openapi-generator/src/main/resources/powershell/Org.OpenAPITools.psm1.mustache b/modules/openapi-generator/src/main/resources/powershell/Org.OpenAPITools.psm1.mustache index 32795eca376..feb7ee5ec66 100644 --- a/modules/openapi-generator/src/main/resources/powershell/Org.OpenAPITools.psm1.mustache +++ b/modules/openapi-generator/src/main/resources/powershell/Org.OpenAPITools.psm1.mustache @@ -17,7 +17,9 @@ $Script:Configuration = [System.Collections.HashTable]@{} $Script:CmdletBindingParameters = @('Verbose','Debug','ErrorAction','WarningAction','InformationAction','ErrorVariable','WarningVariable','InformationVariable','OutVariable','OutBuffer','PipelineVariable') -'Api', 'Model', 'Client', 'Private' | Get-ChildItem -Path { +'Api', 'Model', 'Client', 'Private' | Where-Object { + Join-Path $PSScriptRoot $_ | Test-Path +} | Get-ChildItem -Path { Join-Path $PSScriptRoot $_ } -Filter '*.ps1' | ForEach-Object { Write-Debug "Importing file: $($_.BaseName)"