Update Sonarr to v3

SynoCommunity · Dec 10, 2019 · b5bbe4e · b5bbe4e
1 parent 5a67e15
commit b5bbe4e
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 17 deletions.
diff --git a/cross/sonarr/Makefile b/cross/sonarr/Makefile
@@ -1,9 +1,9 @@
-PKG_NAME = NzbDrone
-PKG_VERS = 2.0.0.5301
+PKG_NAME = Sonarr
+PKG_VERS = 3.0.3.654
 PKG_EXT = tar.gz
-PKG_DIST_NAME = $(PKG_NAME).master.$(PKG_VERS).mono.$(PKG_EXT)
-PKG_DIST_SITE = http://download.sonarr.tv/v2/master/mono
-PKG_DIR = NzbDrone
+PKG_DIST_NAME = $(PKG_NAME).phantom-develop.$(PKG_VERS).linux.$(PKG_EXT)
+PKG_DIST_SITE = http://download.sonarr.tv/v3/phantom-develop/$(PKG_VERS)
+PKG_DIR = Sonarr
 
 DEPENDS =
 

diff --git a/cross/sonarr/PLIST b/cross/sonarr/PLIST
@@ -1 +1 @@
-rsc:share/NzbDrone
+rsc:share/Sonarr
diff --git a/cross/sonarr/digests b/cross/sonarr/digests
@@ -1,3 +1,3 @@
-NzbDrone.master.2.0.0.5301.mono.tar.gz SHA1 0b1136de07ddc56d470374a720e5dd359deac747
-NzbDrone.master.2.0.0.5301.mono.tar.gz SHA256 5b02f10cd3fdd1bc947bc2122131bc542db1cc980c5a4f32f04d16f980ee529a
-NzbDrone.master.2.0.0.5301.mono.tar.gz MD5 702b645720fc7f0008b975f78186bdc3
+Sonarr.phantom-develop.3.0.3.654.linux.tar.gz SHA1 69db134f68d749b4b516595e85ebb967670ee0ca
+Sonarr.phantom-develop.3.0.3.654.linux.tar.gz SHA256 1a51563401122d61d1fcfb9a7aba53c1ec23b33d30cff682b91a2bbc6d800405
+Sonarr.phantom-develop.3.0.3.654.linux.tar.gz MD5 a68e28df8932f430b7e5b2932b899f56
diff --git a/spk/sonarr/Makefile b/spk/sonarr/Makefile
@@ -1,6 +1,6 @@
 SPK_NAME = nzbdrone
 SPK_VERS = $(shell date +%Y%m%d)
-SPK_REV = 15
+SPK_REV = 16
 SPK_ICON = src/sonarr.png
 
 REQUIRED_DSM = 5.0
@@ -18,7 +18,7 @@ DESCRIPTION_SPN = Sonarr es un PVR para los usuarios de grupos de noticias y tor
 RELOAD_UI = yes
 DISPLAY_NAME = Sonarr
 STARTABLE = yes
-CHANGELOG = "Update Sonarr to v2.0.0.5301."
+CHANGELOG = "Update Sonarr to v3.0.3.654"
 
 HOMEPAGE = https://sonarr.tv
 LICENSE  = GPLv3

diff --git a/spk/sonarr/src/service-setup.sh b/spk/sonarr/src/service-setup.sh
@@ -57,10 +57,10 @@ service_preupgrade ()
     # The /var/ folder gets automatically copied by service-installer after this
     if [ -d "${LEGACY_CONFIG_DIR}" ]; then
         echo "Moving ${LEGACY_CONFIG_DIR} to ${INST_VAR}" >> ${INST_LOG}
-        mv ${LEGACY_CONFIG_DIR} ${CONFIG_DIR} >> ${LOG_FILE} 2>&1
+        mv ${LEGACY_CONFIG_DIR} ${CONFIG_DIR} >> ${INST_LOG} 2>&1
     else
         # Create, in case it's missing for some reason
-        mkdir ${CONFIG_DIR} >> ${LOG_FILE} 2>&1
+        mkdir ${CONFIG_DIR} >> ${INST_LOG} 2>&1
     fi
 
     # Is Installed Sonarr Binary Ver. >= SPK Sonarr Binary Ver.?
@@ -85,8 +85,8 @@ service_postupgrade ()
     . ${CONFIG_DIR}/KEEP_VAR
     if [ "$KEEP_CUR" == "yes" ]; then
         echo "Restoring Sonarr version from before upgrade" >> ${INST_LOG}
-        rm -fr ${SYNOPKG_PKGDEST}/share >> $INST_LOG 2>&1
-        mv ${INST_VAR}/share ${SYNOPKG_PKGDEST}/ >> $INST_LOG 2>&1
+        rm -fr ${SYNOPKG_PKGDEST}/share >> ${INST_LOG} 2>&1
+        mv ${INST_VAR}/share ${SYNOPKG_PKGDEST}/ >> ${INST_LOG} 2>&1
         set_unix_permissions "${SYNOPKG_PKGDEST}/share"
     fi
 
@@ -96,6 +96,8 @@ service_postupgrade ()
     # new updates/backups will fail due to permissions (see #3185)
     set_unix_permissions "/tmp/nzbdrone_backup"
     set_unix_permissions "/tmp/nzbdrone_update"
+    set_unix_permissions "/tmp/sonarr_backup"
+    set_unix_permissions "/tmp/sonarr_update"
 
     # Remove upgrade Flag
     rm ${CONFIG_DIR}/KEEP_VAR

diff --git a/spk/sonarr/src/wizard/upgrade_uifile b/spk/sonarr/src/wizard/upgrade_uifile
@@ -1,7 +1,12 @@
 [{
+    "step_title": "RECOMMENDATION: Download A Backup Before Upgrading",
+    "items": [{
+        "desc": "<strong style='color:red'>IMPORTANT:</strong> This update is an upgrade to Sonarr v3. We suggest that you download a manual backup as a precautionary measure before installing this update.<br><br>You can download a backup via Sonarr's built-in web-interface.<br>To do this, navigate to <b>System>Backup</b> in the Sonarr UI.<br><br>Create a backup and then download a copy of that backup before installing this upgrade."
+    }]
+},{
     "step_title": "Updating Sonarr",
     "items": [{
-        "desc": "Keep Sonarr up-to-date by using Sonarr's built-in updater.<br>Navigate to System>Updates in the Sonarr UI."
+        "desc": "Keep Sonarr up-to-date by using Sonarr's built-in updater.<br>Navigate to <b>System>Updates</b> in the Sonarr UI."
     }]
 },{
     "step_title": "Attention! DSM Permissions",

diff --git a/spk/sonarr/src/wizard/upgrade_uifile_fre b/spk/sonarr/src/wizard/upgrade_uifile_fre
@@ -1,7 +1,12 @@
 [{
+    "step_title": "RECOMMENDATION: Télécharger une sauvegarde avant la mise à niveau",
+    "items": [{
+        "desc": "<strong style='color:red'>IMPORTANT:</strong> Cette mise à jour est une mise à niveau vers Sonarr v3. Nous vous suggérons de télécharger une sauvegarde manuelle par mesure de précaution avant d'installer cette mise à jour.<br><br>Vous pouvez télécharger une sauvegarde via l'interface Web intégrée de Sonarr.<br>Pour ce faire, accédez à <b>System>Backup</b> dans l'interface utilisateur Sonarr.<br><br>Créez une sauvegarde, puis téléchargez une copie de cette sauvegarde avant d'installer cette mise à niveau."
+    }]
+},{
     "step_title": "Mettre à jour Sonarr",
     "items": [{
-        "desc": "Garder Sonarr à jour en utilisant System>Updates dans l'interface Sonarr."
+        "desc": "Garder Sonarr à jour en utilisant <b>System>Updates</b> dans l'interface Sonarr."
     }]
 },{
     "step_title": "Attention! Permissions DSM",