fixes #174 persisting RebootOk accross nested installs

mwrock · mwrock · commit 22f6746086d3 · 2016-04-21T06:50:22.000-07:00
diff --git a/Boxstarter.Chocolatey/Init-Settings.ps1 b/Boxstarter.Chocolatey/Init-Settings.ps1
@@ -7,4 +7,4 @@ if($BoxStarter.LocalRepo.StartsWith("$env:windir")) {
    if(!(Test-Path $BoxStarter.LocalRepo)) { mkdir $BoxStarter.LocalRepo | Out-Null }
 }
 $Boxstarter.NugetSources=$config.NugetSources
-$Boxstarter.RebootOk=$true
+if(!$Boxstarter.ContainsKey('RebootOk')) { $Boxstarter.RebootOk=$true }
diff --git a/BuildScripts/releaseNotes.xml b/BuildScripts/releaseNotes.xml
@@ -1,4 +1,5 @@
 <releaseNotes>
+- Persist RebootOk setting in nested installs
 - Suppress bogus Invalid Namespace errors
 - Added ability to configure "Expand to open folder" in Set-WindowsExplorerOptions
 - Added ability to configure QuickAccess options in Set-WindowsExplorerOption

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@ if($BoxStarter.LocalRepo.StartsWith("$env:windir")) {`
`7`	`7`	`if(!(Test-Path $BoxStarter.LocalRepo)) { mkdir $BoxStarter.LocalRepo \| Out-Null }`
`8`	`8`	`}`
`9`	`9`	`$Boxstarter.NugetSources=$config.NugetSources`
`10`		`-$Boxstarter.RebootOk=$true`
	`10`	`+if(!$Boxstarter.ContainsKey('RebootOk')) { $Boxstarter.RebootOk=$true }`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<releaseNotes>`
	`2`	`+- Persist RebootOk setting in nested installs`
`2`	`3`	`- Suppress bogus Invalid Namespace errors`
`3`	`4`	`- Added ability to configure "Expand to open folder" in Set-WindowsExplorerOptions`
`4`	`5`	`- Added ability to configure QuickAccess options in Set-WindowsExplorerOption`