Skip to content

Refactor build logic to avoid saving modules in subfolders #979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 28, 2019
Merged

Refactor build logic to avoid saving modules in subfolders #979

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
28e7b80
Refactor build logic to avoid saving modules in subfolders
Jun 20, 2019
e65c18f
Address review comments
Jun 21, 2019
3a8a0b3
Swap logic for checking folder is empty
Jun 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 39 additions & 16 deletions PowerShellEditorServices.build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,30 +313,53 @@ task RestorePsesModules -After Build {
# Save each module in the modules.json file
foreach ($moduleName in $moduleInfos.Keys)
{
if (Test-Path -Path (Join-Path -Path $submodulePath -ChildPath $moduleName))
$moduleInstallPath = (Join-Path -Path $subModulePath -ChildPath $moduleName)

if (-not (Test-Path -Path $moduleInstallPath))
{
Write-Host "`tModule '${moduleName}' already detected. Skipping"
continue
}
Write-Host "`tInstalling module: ${moduleName}"

$moduleInstallDetails = $moduleInfos[$moduleName]
$moduleInstallDetails = $moduleInfos[$moduleName]

$splatParameters = @{
Name = $moduleName
MinimumVersion = $moduleInstallDetails.MinimumVersion
MaximumVersion = $moduleInstallDetails.MaximumVersion
Repository = if ($moduleInstallDetails.Repository) { $moduleInstallDetails.Repository } else { $DefaultModuleRepository }
Path = $submodulePath
}
$splatParameters = @{
Name = $moduleName
MinimumVersion = $moduleInstallDetails.MinimumVersion
MaximumVersion = $moduleInstallDetails.MaximumVersion
Repository = if ($moduleInstallDetails.Repository) { $moduleInstallDetails.Repository } else { $DefaultModuleRepository }
Path = $submodulePath
}

if ($script:SaveModuleSupportsAllowPrerelease)
if ($script:SaveModuleSupportsAllowPrerelease)
{
$splatParameters += @{ AllowPrerelease = $moduleInstallDetails.AllowPrerelease }
}

Save-Module @splatParameters
}
else
{
$splatParameters += @{ AllowPrerelease = $moduleInstallDetails.AllowPrerelease }
Write-Host "`tModule '${moduleName}' already detected."
}

Write-Host "`tInstalling module: ${moduleName}"
# Version number subfolders aren't supported in PowerShell < 5.0
# If the module is located in a subfolder, move the module files up one level and remove the (empty) subfolder.
$moduleFolderChildItems = Get-ChildItem -Path $moduleInstallPath -Force

Save-Module @splatParameters
if ($moduleFolderChildItems.Count -eq 1 -and $moduleFolderChildItems[0].PSIsContainer)
{
Write-Host "`tMoving module '${moduleName}' out of subfolder."

$moduleSubfolder = $moduleFolderChildItems[0].FullName

Get-ChildItem -Path $moduleSubfolder -Recurse -Force | Move-Item -Destination $moduleInstallPath -Force

if ($null -ne (Get-ChildItem -Path $moduleSubfolder -Recurse -Force))
{
throw "Cannot remove folder $moduleSubfolder because it is not empty!"
}

Remove-Item -Path $moduleSubfolder
}
}
Write-Host "`n"
}
Expand Down