diff --git a/ConEmu/ConEmu.nuspec b/ConEmu/ConEmu.nuspec index 1cee29f..51293dd 100644 --- a/ConEmu/ConEmu.nuspec +++ b/ConEmu/ConEmu.nuspec @@ -2,7 +2,7 @@ ConEmu - 14.9.23.0 + 15.02.24a Maximus5 Xavier Decoster, Ethan J. Brown http://opensource.org/licenses/BSD-3-Clause diff --git a/ConEmu/tools/chocolateyInstall.ps1 b/ConEmu/tools/chocolateyInstall.ps1 index 0487b2a..3720157 100644 --- a/ConEmu/tools/chocolateyInstall.ps1 +++ b/ConEmu/tools/chocolateyInstall.ps1 @@ -1,5 +1,5 @@ $package = 'ConEmu' -$version = '14.09.23' +$version = '15.02.24a' try { @@ -11,33 +11,17 @@ try { # TODO: use github api to grab latest release? $url = "https://github.com/Maximus5/ConEmu/releases/download/v$version/ConEmuSetup.$($version.replace('.','')).exe" - $chocTemp = Join-Path $Env:TEMP 'chocolatey' - $tempInstall = Join-Path $chocTemp "ConEmu\ConEmuSetup.$version.exe" + echo $url - Write-Host "Downloading from $url to $tempInstall" - - # need a Referer, User-Agent and Accept to be able to download - # other headers not required - $client = New-Object Net.WebClient - $client.DownloadFile($url, $tempInstall) - - Write-Host "Download from $url complete" - - # If having problems with untrusted cetrificates on HTTPS, use - # solution: http://stackoverflow.com/a/561242/1579985 $params = @{ PackageName = $package; FileType = 'exe'; SilentArgs = "/p:$os /passive"; - # MSI installer, but packed inside wrapper to select x86 or x64 - # version. Therefore, treat it as EXE type. - File = $tempInstall; - # ValidExitCodes = @(0); + Url = $url; + Url64Bit = $url; } - Install-ChocolateyInstallPackage @params - - Write-ChocolateySuccess $package + Install-ChocolateyPackage @params } catch { Write-ChocolateyFailure $package "$($_.Exception.Message)" throw diff --git a/ConEmu/tools/chocolateyUninstall.ps1 b/ConEmu/tools/chocolateyUninstall.ps1 index 0489005..8bda318 100644 --- a/ConEmu/tools/chocolateyUninstall.ps1 +++ b/ConEmu/tools/chocolateyUninstall.ps1 @@ -11,7 +11,7 @@ try { $productsRoot = "$installerRoot\UserData\S-1-5-18\Products" # x64, x86 - '1616F7E78FA09834EAA6E0617006EEC7', '8ADD8A72FEF29D044884864D191B15B0' | + '1616F7E78FA09834EAA6E0617006EEC7', '8ADD8A72FEF29D044884864D191B15B0', 'B0790B48745EDCE4F9918AE6829BC1F4' | % { "$productsRoot\$_\InstallProperties" } | ? { Test-Path $_ } | % {