Skip to content

Commit

Permalink
Merge pull request #543 from Ana06/fix-startLayout
Browse files Browse the repository at this point in the history
installer.ps1: Fix CustomStartLayout.xml download
  • Loading branch information
Ana06 authored Nov 23, 2023
2 parents 62dd36e + 9fa8be3 commit 547939d
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,16 @@ foreach ($env in $configXml.config.envs.env) {
}
refreshenv

# Install the common module
# This creates all necessary folders based on custom environment variables
Write-Host "[+] Installing shared module..."
choco install common.vm -y --force
refreshenv

# Use single config
$configXml.save((Join-Path ${Env:VM_COMMON_DIR} "config.xml"))
$configXml.save((Join-Path ${Env:VM_COMMON_DIR} "packages.xml"))

# Custom Start Layout setup
Write-Host "[+] Checking for custom Start Layout file..."
$layoutPath = Join-Path ${Env:VM_COMMON_DIR} "CustomStartLayout.xml"
Expand All @@ -871,16 +881,6 @@ if ([string]::IsNullOrEmpty($customLayout)) {

Get-ConfigFile $layoutPath $layoutSource

# Install the common module
# This creates all necessary folders based on custom environment variables
Write-Host "[+] Installing shared module..."
choco install common.vm -y --force
refreshenv

# Use single config
$configXml.save((Join-Path ${Env:VM_COMMON_DIR} "config.xml"))
$configXml.save((Join-Path ${Env:VM_COMMON_DIR} "packages.xml"))

# Log basic system information to assist with troubleshooting
Write-Host "[+] Logging basic system information to assist with any future troubleshooting..."
Import-Module "${Env:VM_COMMON_DIR}\vm.common\vm.common.psm1" -Force -DisableNameChecking
Expand Down

0 comments on commit 547939d

Please # to comment.