cleaned chocolatey scripts

Author: distantcam

src/Chocolatey/chocolateyInstall.ps1

@@ -1,17 +1,16 @@
 
 $packageName = "ServiceControl"
 
-$url = gci -path "c:\ChocolateyResourceCache" -Filter "Particular.ServiceControl-*.exe" -ErrorAction SilentlyContinue | select -first 1
+$url = gci -path "c:\ChocolateyResourceCache" -Filter "Particular.$packageName-*.exe" -ErrorAction SilentlyContinue| select -first 1
 
 if($url){
 	$url = $url | Select -expandProperty FullName
 }
 else{
-    $url = "https://github.com/Particular/$packageName/releases/download/{{ReleaseName}}/Particular.$packageName-{{FileVersion}}.exe"
+	$url = "https://github.com/Particular/$packageName/releases/download/{{ReleaseName}}/Particular.$packageName-{{FileVersion}}.exe"
 }
 
 
-
 try {
 
     $existngService = Get-Service -Name "Particular.Management" -ErrorAction SilentlyContinue
@@ -20,9 +19,7 @@ try {
     }
 
     $chocTempDir = Join-Path $env:TEMP "chocolatey"
-    
     $tempDir = Join-Path $chocTempDir "$packageName"
-
     if (![System.IO.Directory]::Exists($tempDir)) {[System.IO.Directory]::CreateDirectory($tempDir) | Out-Null}
     $file = Join-Path $tempDir "$($packageName)Install.exe"
     $logFile = Join-Path $tempDir "msiexe.log"
@@ -35,8 +32,8 @@ try {
 	$msiArguments  ="/quiet  /L*V `"$logFile`""
 	Write-Host "Starting installer with arguments: $msiArguments";
     Start-ChocolateyProcessAsAdmin "$msiArguments" $file -validExitCodes 0
-
     Write-ChocolateySuccess $packageName
+    Remove-Item $file -ErrorAction SilentlyContinue 
 } catch {
 	Write-ChocolateyFailure $packageName $($_.Exception.Message)
 	throw

src/Chocolatey/elevatedUninstall.ps1

@@ -1,7 +1,7 @@
 $productName = "ServiceControl";
 $version = "MajorMinorPatch";
 
-$app = Get-WmiObject -Class Win32_Product | Where-Object { $_.Name -like "$productName*"  -and ($_.Version -eq "$version") }
+$app = Get-WmiObject -Class Win32_Product | Where-Object { $_.Name -like "*$productName*"  -and ($_.Version -eq "$version") }
 if($app -eq $null) 
 {
 	Write-Warning "Could not find an installed program for $productName matching version $version to uninstall. It may have been manualy removed. To check the cuurent status ensure that no instance of $productName exists in 'Programs and Features'."