Skip to content
This repository has been archived by the owner on Aug 4, 2023. It is now read-only.

Commit

Permalink
Corrected merge for uninstalled case
Browse files Browse the repository at this point in the history
  • Loading branch information
solacelost committed Mar 14, 2020
1 parent c6f98e9 commit 7ffa716
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Update-TacO.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,11 @@
.NOTES
Name: Update-TacO.ps1
Author: James Harmison
SCRIPT VERSION: 0.3
SCRIPT VERSION: 0.4
Requires: Powershell v5 or higher.
Version History:
0.4 - Corrected merge for uninstalled case
0.3 - Adjusted default pathing to match Update-ArcDPS
0.2 - Added Sane default configuration
0.1 - Initial public release
Expand Down Expand Up @@ -76,7 +77,7 @@ param (
[string]$InstallDirectory="$PSScriptRoot"
)

$scriptversion = '0.3'
$scriptversion = '0.4'
$TacOPath = Join-Path "$InstallDirectory" "Update-TacO"
$TacOStateFile = Join-Path $TacOPath "state.xml"
$TacOTempDir = Join-Path "$env:TEMP" "TacO"
Expand All @@ -94,6 +95,9 @@ Function Merge-TacOConfig {
[Parameter(Mandatory = $true)] [string] $OverrideXMLfile
)

if (-not $(Test-Path $BaseXMLFile)) {
return [xml](Get-Content $OverrideXMLFile)
}
$originalXml = [xml](Get-Content $BaseXMLfile)
$overrideXml = [xml](Get-Content $OverrideXMLfile)

Expand Down

0 comments on commit 7ffa716

Please sign in to comment.