AU: 2 updated - jackett sonarr

[skip ci] https://gist.github.com/508bb89c4cc35b67842940c60310532b/7d439dce25fc8b846ab64122a3210efbf09157f9
JourneyOver · Mar 22, 2019 · 94d3a1f · 94d3a1f
1 parent 1c4ec19
commit 94d3a1f
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 37 deletions.
diff --git a/automatic/jackett/jackett.nuspec b/automatic/jackett/jackett.nuspec
@@ -4,7 +4,7 @@
   <metadata>
     <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
     <id>jackett</id>
-    <version>0.11.102</version>
+    <version>0.11.106</version>
     <packageSourceUrl>https://github.com/JourneyOver/chocolatey-packages/tree/master/automatic/jackett</packageSourceUrl>
     <owners>JourneyOver</owners>
     <title>Jackett</title>

diff --git a/automatic/jackett/legal/VERIFICATION.txt b/automatic/jackett/legal/VERIFICATION.txt
@@ -4,19 +4,19 @@ Verification is intended to assist the Chocolatey moderators and community
 in verifying that this package's contents are trustworthy.
 
 The embedded software has been downloaded from the listed download
-location on <https://github.com/Jackett/Jackett/releases/tag/v0.11.102>
+location on <https://github.com/Jackett/Jackett/releases/tag/v0.11.106>
 and can be verified by doing the following:
 
 1. Download the following:
 
-  url: <https://github.com/Jackett/Jackett/releases/download/v0.11.102/Jackett.Installer.Windows.exe>
+  url: <https://github.com/Jackett/Jackett/releases/download/v0.11.106/Jackett.Installer.Windows.exe>
 
 2. You can obtain the checksum using one of the following methods:
   - Use powershell function 'Get-FileHash'
   - Use Chocolatey utility 'checksum.exe'
 
   checksum type: sha256
-  checksum: 0194ADD01099F39BF1EB77642F0D1BE263FA27108DBE992451D6A5A82FE5CC78
+  checksum: DE8211AAC9C1C02520472E18879BBDD51FF06A61AD720324729FABE2BFFF5340
 
 Using AU:
 

diff --git a/automatic/sonarr/README.md b/automatic/sonarr/README.md
@@ -24,9 +24,4 @@ Sonarr (formerly NzbDrone) is a PVR for Usenet and BitTorrent users. It can moni
 
 ## Notes
 
-This is the pre-release versions of Sonarr V3 otherwise known as Phantom.
-
--   Sonarr v2 migration
-    - Sonarr v3 will automatically convert the existing Sonarr v2 installation. Sonarr v2 stored it's database in `C:\ProgramData\NzbDrone`, which will be automatically converted to `C:\ProgramData\Sonarr`. It's advisable to make a backup of the v2 data first.
-
 Installs as a service, to get to Sonarr open browser and go [here](http://localhost:8989/) or go to http://<your-ip>:8989/
diff --git a/automatic/sonarr/legal/VERIFICATION.txt b/automatic/sonarr/legal/VERIFICATION.txt
@@ -9,14 +9,14 @@ and can be verified by doing the following:
 
 1. Download the following:
 
-  url: <http://download.sonarr.tv/v3/phantom-develop/3.0.1.411/Sonarr.phantom-develop.3.0.1.411.windows.exe>
+  url: <https://download.sonarr.tv/v2/master/latest/NzbDrone.master.exe>
 
   2. You can obtain the checksum using one of the following methods:
     - Use powershell function 'Get-FileHash'
     - Use Chocolatey utility 'checksum.exe'
 
   checksum type: sha256
-  checksum: ECFC2F7C1E6FD604A69178C142B7EB0EAC2A03F534BC945129E7EE609D9C7E48
+  checksum: 7C3C6577C28F700CDE65D9658FC3C3AC6CC5FE3B8539212BF2A572362CA5493C
 
 Using AU:
 

diff --git a/automatic/sonarr/sonarr.json b/automatic/sonarr/sonarr.json
@@ -1,5 +1,5 @@
 {
     "phantom":  "3.0.1.411-phantom",
     "beta":  "2.0.0.5318-beta",
-    "stable":  "2.0.0.5301"
+    "stable":  "2.0.0.5319"
 }
diff --git a/automatic/sonarr/sonarr.nuspec b/automatic/sonarr/sonarr.nuspec
@@ -4,7 +4,7 @@
   <metadata>
     <!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
     <id>sonarr</id>
-    <version>3.0.1.411-phantom</version>
+    <version>2.0.0.5319</version>
     <packageSourceUrl>https://github.com/JourneyOver/chocolatey-packages/tree/master/automatic/sonarr</packageSourceUrl>
     <owners>JourneyOver, dtgm</owners>
     <title>Sonarr</title>
@@ -44,11 +44,6 @@
 
 ## Notes
 
-This is the pre-release versions of Sonarr V3 otherwise known as Phantom.
-
--   Sonarr v2 migration
-    - Sonarr v3 will automatically convert the existing Sonarr v2 installation. Sonarr v2 stored it's database in `C:\ProgramData\NzbDrone`, which will be automatically converted to `C:\ProgramData\Sonarr`. It's advisable to make a backup of the v2 data first.
-
 Installs as a service, to get to Sonarr open browser and go [here](http://localhost:8989/) or go to http://<your-ip>:8989/
 ]]></description>
     <releaseNotes>
@@ -57,7 +52,7 @@ Installs as a service, to get to Sonarr open browser and go [here](http://localh
 
 #### Package
 * Automatically built and uploaded by [JourneyOver](https://chocolatey.org/profiles/JourneyOver)</releaseNotes>
-    <dependencies><dependency id="dotnet4.6.1" version="4.6.01055.20170308" /></dependencies>
+    <dependencies></dependencies>
   </metadata>
   <files>
     <file src="tools\**" target="tools" />

diff --git a/automatic/sonarr/tools/chocolateyBeforeModify.ps1 b/automatic/sonarr/tools/chocolateyBeforeModify.ps1
@@ -1,5 +1,5 @@
 # Stop Sonarr service before upgrade/uninstall if running
-$service = 'Sonarr'
+$service = 'NzbDrone'
 if (Get-Service "$service" -ErrorAction SilentlyContinue) {
   $running = Get-Service $service
   if ($running.Status -eq "Running") {

diff --git a/automatic/sonarr/tools/chocolateyInstall.ps1 b/automatic/sonarr/tools/chocolateyInstall.ps1
@@ -1,30 +1,26 @@
 $ErrorActionPreference = 'Stop'
 
 $packageName = 'sonarr'
+$programUninstallEntryName = 'Sonarr*'
 
-$toolsDir = Split-Path $MyInvocation.MyCommand.Definition
-$fileLocation = Get-Item "$toolsDir\*.exe"
+$registry = Get-UninstallRegistryKey -SoftwareName $programUninstallEntryName
+$file = $registry.UninstallString
 
 $packageArgs = @{
   packageName    = $packageName
   fileType       = 'exe'
-  file           = $fileLocation
-  silentArgs     = "/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP- /LOG=`"$($env:TEMP)\$($env:chocolateyPackageName).$($env:chocolateyPackageVersion).InnoInstall.log`""
+  silentArgs     = '/VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-'
   validExitCodes = @(0)
+  file           = $file
 }
 
-Install-ChocolateyInstallPackage @packageArgs
+Uninstall-ChocolateyPackage @packageArgs
 
-# Remove the installers as there is no more need for it
-Remove-Item $toolsDir\*.exe -ea 0 -Force
-
-# Start service if it's not running
-$service = 'Sonarr'
-if (Get-Service "$service" -ErrorAction SilentlyContinue) {
-  $running = Get-Service $service
-  if ($running.Status -eq "Running") {
-    Write-Host 'Service is already running'
-  } elseif ($running.Status -eq "Stopped") {
-    Start-Service $service
-  }
+#remove Sonarr folder that gets left behind
+$fexist = Test-Path $env:ProgramData\NzbDrone
+if ($fexist) {
+  Write-Host "Removing Sonarr Folder that's left behind"
+  Remove-Item $env:ProgramData\NzbDrone -Recurse -Force
+} else {
+  Write-Host "Sonarr Folder not found"
 }