allow choc upgrade

stevenmcohn · stevenmcohn · commit 077c7070ead0 · 2018-06-06T15:11:59.000-04:00
diff --git a/Modules/Scripts/Install-Chocolatey.ps1 b/Modules/Scripts/Install-Chocolatey.ps1
@@ -3,11 +3,11 @@
 Can be used on new machines to install Chocolately. If already installed then
 checks if it is outdated and prompts to update.
 
-.PARAMETER -Yes
-Upgrade without prompting if an update is available.
+.PARAMETER Upgrade
+Check if Chocolatey is outdated and update if it is.
 #>
 
-param ([switch] $Yes)
+param ([switch] $Upgrade)
 
 if (-not (Get-Command 'choco' -ErrorAction:Ignore))
 {
@@ -26,13 +26,10 @@ if (-not (Get-Command 'choco' -ErrorAction:Ignore))
 	Write-Host 'Install'
 	Invoke-Expression $installer
 }
-else
+elseif ($Upgrade)
 {
-	choco outdated -r
-
-	# TODO: react...
-	if ($Yes)
+	(choco outdated -r) | % { $_ -match 'chocolatey\|'} | % `
 	{
-		# blah...
+		choco upgrade chocolatey -y
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,11 @@`
`3`	`3`	`Can be used on new machines to install Chocolately. If already installed then`
`4`	`4`	`checks if it is outdated and prompts to update.`
`5`	`5`
`6`		`-.PARAMETER -Yes`
`7`		`-Upgrade without prompting if an update is available.`
	`6`	`+.PARAMETER Upgrade`
	`7`	`+Check if Chocolatey is outdated and update if it is.`
`8`	`8`	`#>`
`9`	`9`
`10`		`-param ([switch] $Yes)`
	`10`	`+param ([switch] $Upgrade)`
`11`	`11`
`12`	`12`	`if (-not (Get-Command 'choco' -ErrorAction:Ignore))`
`13`	`13`	`{`
`@@ -26,13 +26,10 @@ if (-not (Get-Command 'choco' -ErrorAction:Ignore))`
`26`	`26`	`Write-Host 'Install'`
`27`	`27`	`Invoke-Expression $installer`
`28`	`28`	`}`
`29`		`-else`
	`29`	`+elseif ($Upgrade)`
`30`	`30`	`{`
`31`		`- choco outdated -r`
`32`		`-`
`33`		`- # TODO: react...`
`34`		`- if ($Yes)`
	`31`	+ (choco outdated -r) \| % { $_ -match 'chocolatey\\|'} \| % `
`35`	`32`	`{`
`36`		`- # blah...`
	`33`	`+ choco upgrade chocolatey -y`
`37`	`34`	`}`
`38`	`35`	`}`