#198 freenet

automatic/freenet/freenet.nuspec

@@ -46,6 +46,7 @@ By running this program you contribute to the security of the overall Freenet ne
     <dependencies>
       <dependency id="javaruntime" />
       <dependency id="dotnet3.5" />
+      <dependency id="chocolatey-uninstall.extension" /> 
     </dependencies>
   </metadata>
   <files>

automatic/freenet/tools/chocolateyUninstall.ps1

@@ -1,16 +1,13 @@
 $packageName = '{{PackageName}}'
-$packageSearch = $packageName
+$softwareName = "$packageName*"
 $installerType = 'exe'
 $silentArgs = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-'
 $validExitCodes = @(0)
 
-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 -like "$packageSearch*" } `
-| ForEach-Object { Uninstall-ChocolateyPackage -PackageName "$packageName" `
-                                               -FileType "$installerType" `
-                                               -SilentArgs "$($silentArgs)" `
-                                               -File "$($_.UninstallString)" `
-                                               -ValidExitCodes $validExitCodes }
+[array]$key = Get-UninstallRegistryKey -SoftwareName $softwareName
+$key | ForEach-Object { 
+  Uninstall-ChocolateyPackage -PackageName "$packageName" `
+                              -FileType "$installerType" `
+                              -SilentArgs "$($silentArgs)" `
+                              -File "$($_.UninstallString)" `
+                              -ValidExitCodes $validExitCodes }