Merge pull request #80 from mikeee/fix-msiafterburner

Fix msiafterburner uninstallation

Author: mikeee

automatic/msiafterburner/msiafterburner.nuspec

@@ -74,6 +74,7 @@ enclosed in quotation marks, you should use an editor that supports UTF-8, not t
         <!-- Specifying dependencies and version ranges?
         https://docs.nuget.org/create/versioning#specifying-version-ranges-in-.nuspec-files -->
         <dependencies>
+            <dependency id="autohotkey.portable" version="1.1.30.03" />
             <!-- <dependency id="autohotkey" /> -->
             <!-- <dependency id="" version="[__EXACT_VERSION__]" /> -->
             <!-- <dependency id="" version="[_MIN_VERSION_INCLUSIVE, MAX_VERSION_EXCLUSIVE)" /> -->

automatic/msiafterburner/tools/chocolateyInstall.ps1

@@ -5,15 +5,12 @@ $checksumType = 'SHA256'
 $unpackDir = $(Split-Path -parent $MyInvocation.MyCommand.Definition)
 $unpackFile = Join-Path $unpackDir 'afterburner.zip'
 
-$toolsPath = Split-Path $MyInvocation.MyCommand.Definition
-. $toolsPath\helpers.ps1
+Get-Process -Name 'msi afterburner' -ErrorAction SilentlyContinue | Stop-Process
 
 Get-ChocolateyWebFile $packageName $unpackFile $url -Checksum $checksum -ChecksumType $checksumType
 Get-ChocolateyUnzip -fileFullPath $unpackFile -destination $unpackDir
 $file = (Get-ChildItem -Path $unpackDir -Recurse | Where-Object { $_.Name -match "^MSIAfterburnerSetup.*\.exe$" }).fullname
 
-Stop-Afterburner
-
 $packageArgs = @{
   PackageName    = $packageName
   FileType       = 'exe'

automatic/msiafterburner/tools/chocolateyUninstall.ps1

@@ -1,34 +1,32 @@
-$packageName = 'msiafterburner'
-$installerType = 'exe'
+$ErrorActionPreference = 'Stop';
+
+$packageName = $env:ChocolateyPackageName
+$software = @('MSI Afterburner*', 'RivaTuner Statistics Server*')
 $silentArgs = '/S'
-$validExitCodes = @(0)
 $scriptPath = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)"
 $ahkFile = Join-Path $scriptPath 'chocolateyUninstall.ahk'
 $ahkExe = 'AutoHotKey'
 $ahkRun = "$Env:Temp\$(Get-Random).ahk"
-$packageSearchRegex = '^(MSI Afterburner|RivaTuner Statistics Server).*'
-
-$toolsPath = Split-Path $MyInvocation.MyCommand.Definition
-. $toolsPath\helpers.ps1
-
-Stop-Afterburner
 
 Copy-Item $ahkFile "$ahkRun" -Force
 Start-Process $ahkExe $ahkRun
 
-Get-ItemProperty `
-  -Path @('HKLM:\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\*',
-          'HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*',
-          'HKCU:\Software\Microsoft\Windows\CurrentVersion\Uninstall\*') `
-  -ErrorAction:SilentlyContinue `
-| Where-Object `
-  {$_.DisplayName -Match $packageSearchRegex} `
-| ForEach-Object `
-  {Uninstall-ChocolateyPackage `
-    -PackageName "$packageName" `
-    -FileType "$installerType" `
-    -SilentArgs "$($silentArgs)" `
-    -File "$($_.UninstallString.Replace('"',''))" `
-    -ValidExitCodes $validExitCodes}
+For($i=0; $i -lt $software.Length; $i++) {
+  [array]$key = Get-UninstallRegistryKey -SoftwareName $software[$i]
+
+  if ($key.Count -eq 1) {
+    $key | ForEach-Object {
+      $file = $($_.UninstallString)
+      Start-Process $file -ArgumentList $silentArgs -Verb RunAs
+    }
+  } elseif ($key.Count -eq 0) {
+    Write-Warning "$packageName has already been uninstalled by other means."
+  } elseif ($key.Count -gt 1) {
+    Write-Warning "$key.Count matches found!"
+    Write-Warning "To prevent accidental data loss, no programs will be uninstalled."
+    Write-Warning "Please alert package maintainer(s) the following keys were matched:"
+    $key | ForEach-Object {Write-Warning "- $_.DisplayName"}
+  }
+}
 
 Remove-Item "$ahkRun" -Force