updated to Sick-Rage repo, version v2018.10.10-2

7 files changed, 75 insertions, 118 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bdb41a54277..dddb833b3cbb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,36 +1,29 @@
 pkgbase = sickrage
-	pkgdesc = A PVR application that downloads and manages your TV shows. Echel0n fork of sickbeard, with tvrage, torrents and anime support.
-	pkgver = 4.2.5
-	pkgrel = 3
-	url = https://github.com/SiCKRAGETV/SickRage
+	pkgdesc = Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic.
+	pkgver = 2018.10.10
+	pkgrel = 2
+	url = https://github.com/Sick-Rage/Sick-Rage
 	install = sickrage.install
 	arch = any
 	license = GPL3
-	depends = python2-mako
+	depends = nodejs
+	depends = python2-babel
 	depends = python2-cheetah
-	optdepends = sabnzbd: NZB downloader
-	optdepends = transmission-cli: supported torrent client
-	optdepends = deluge: supported torrent client
-	optdepends = rtorrent: supported torrent client
-	optdepends = qbittorrent: supported torrent client
-	optdepends = python2-notify: desktop notifications (libnotify)
-	optdepends = unrar: rar extraction support
-	optdepends = git: pull new versions from git
-	provides = sickbeard-tvrage-git
+	depends = python2-mako
+	optdepends = python2-notify
+	optdepends = unrar
+	conflicts = pymedusa
 	conflicts = sickbeard
-	conflicts = sickbeard-piratebay-git
-	conflicts = sickbeard-tvrage-git
 	conflicts = sickrage-git
-	replaces = sickbeard-tvrage-git
+	conflicts = sickrage2-git
+	conflicts = sickgear-git
 	options = !strip
-	source = https://github.com/SiCKRAGETV/SickRage/archive/4.2.5.tar.gz
-	source = sickrage-system.service
-	source = sickrage-user.service
-	source = sickrage.tmpfile
-	md5sums = 3c13a8468d3dfe3e7ffe2412cfe29692
-	md5sums = 518016cf0c33e384b1e0977294fafa17
-	md5sums = 9fdba8dda62d8205e2cfc3268f19f32f
-	md5sums = fa9ac7ae0b6c55033ef8fe5b7c83bb0f
+	source = https://github.com/Sick-Rage/Sick-Rage/archive/v2018.10.10-2.tar.gz
+	source = sickrage.service
+	source = sickrage.install
+	md5sums = 024e9edce2dd57aa790cc4fa5a813a70
+	md5sums = 18e8ac10a90c7eb3cc596caa02261a3e
+	md5sums = ac4c96c5d3b7b4a86c653929c5f4aa60
 
 pkgname = sickrage
 
diff --git a/PKGBUILD b/PKGBUILD
index bbb46451af76..02a8afe5b059 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,45 @@
-# Maintainer: gls < ghostlovescorebg at gmail dot com>
+# Maintainer: Carlos Bellino <carlosbellino@gmail.com>
 
 pkgname=sickrage
-pkgver=4.2.5
-pkgrel=3
-pkgdesc="A PVR application that downloads and manages your TV shows. Echel0n fork of sickbeard, with tvrage, torrents and anime support."
+_gitname=Sick-Rage
+_gitauthor=Sick-Rage
+_sickrage_dir="/opt/sickrage"
+pkgver=2018.10.10
+pkgrel=2
+pkgdesc="Automatic Video Library Manager for TV Shows. It watches for new episodes of your favorite shows, and when they are posted it does its magic."
 arch=('any')
-url="https://github.com/SiCKRAGETV/SickRage"
+url="https://github.com/${_gitauthor}/${_gitname}"
 license=('GPL3')
-depends=('python2-mako' 'python2-cheetah')
-optdepends=('sabnzbd: NZB downloader'
-			'transmission-cli: supported torrent client'
-			'deluge: supported torrent client'
-			'rtorrent: supported torrent client'
-			'qbittorrent: supported torrent client'
-			'python2-notify: desktop notifications (libnotify)'
-			'unrar: rar extraction support'
-			'git: pull new versions from git')
-provides=('sickbeard-tvrage-git')
-conflicts=('sickbeard' 'sickbeard-piratebay-git' 'sickbeard-tvrage-git' 'sickrage-git')
-replaces=('sickbeard-tvrage-git')
+
+depends=('nodejs'
+         'python2-babel'
+         'python2-cheetah'
+         'python2-mako')
+
+optdepends=('python2-notify'
+            'unrar')
+
+conflicts=(${_pkgname}
+           'pymedusa'
+           'sickbeard'
+           'sickrage-git'
+           'sickrage2-git'
+           'sickgear-git')
+
 options=('!strip')
-install='sickrage.install'
-source=("https://github.com/SiCKRAGETV/SickRage/archive/${pkgver}.tar.gz"
-		'sickrage-system.service'
-		'sickrage-user.service'
-		'sickrage.tmpfile')
+install=${pkgname}.install
 
-md5sums=('3c13a8468d3dfe3e7ffe2412cfe29692'
-         '518016cf0c33e384b1e0977294fafa17'
-         '9fdba8dda62d8205e2cfc3268f19f32f'
-         'fa9ac7ae0b6c55033ef8fe5b7c83bb0f')
+source=("https://github.com/${_gitauthor}/${_gitname}/archive/v${pkgver}-${pkgrel}.tar.gz"
+        "${pkgname}.service"
+        "${pkgname}.install")
 
-package() {
-	mkdir -p "${pkgdir}/opt/sickrage"
-	chmod 775 "${pkgdir}/opt/sickrage"
-	cp -r ${srcdir}/SiCKRAGE-${pkgver}/* ${pkgdir}/opt/sickrage
+md5sums=('024e9edce2dd57aa790cc4fa5a813a70'
+         '18e8ac10a90c7eb3cc596caa02261a3e'
+         'ac4c96c5d3b7b4a86c653929c5f4aa60')
 
-	install -D -m644 sickrage-system.service "${pkgdir}/usr/lib/systemd/system/sickrage.service"
-	install -D -m644 sickrage-user.service "${pkgdir}/usr/lib/systemd/user/sickrage.service"
-	install -D -m644 sickrage.tmpfile "${pkgdir}/usr/lib/tmpfiles.d/sickrage.conf"
+package() {
+  install -Dm644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -dm755 "${pkgdir}${_sickrage_dir}"/{app,data}
 
-	find ${pkgdir} -type d -name '.git' -exec rm -r '{}' +
+  cp -rp "${srcdir}/${_gitname}-${pkgver}-${pkgrel}"/* "${pkgdir}${_sickrage_dir}"/app/
 }
-
-# vim: set ts=2 sw=2 ft=sh noet:
diff --git a/sickrage-system.service b/sickrage-system.service
deleted file mode 100644
index 72ae4fb1ffa5..000000000000
--- a/sickrage-system.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=SickRage Daemon
-After=network.target
-## If you want to ensure a torrent client (or usenet client) is running)
-#Requires=deluged.service
-
-[Service]
-User=sickrage
-Type=forking
-PIDFile=/run/sickrage/sickrage.pid
-ExecStart=/usr/bin/env python2 /opt/sickrage/SickBeard.py -q --daemon --nolaunch --pidfile=/run/sickrage/sickrage.pid --config /opt/sickrage/config.ini --datadir /opt/sickrage
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sickrage-user.service b/sickrage-user.service
deleted file mode 100644
index 4b5f9346e0ac..000000000000
--- a/sickrage-user.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=SickRage Daemon
-## If you want to ensure a torrent client (or usenet client) is running)
-#Requires=deluged.service
-
-[Service]
-ExecStart=/usr/bin/env python2 /opt/sickrage/SickBeard.py --quiet --config %h/.sickrage/config.ini --datadir %h/.sickrage
-
-[Install]
-WantedBy=default.target
diff --git a/sickrage.install b/sickrage.install
index 7d4fef08e55e..51a28cae61c5 100644
--- a/sickrage.install
+++ b/sickrage.install
@@ -1,41 +1,18 @@
-SB_USER=sickrage
+SICKRAGE_USER="sickrage"
+SICKRAGE_GROUP="sickrage"
+SICKRAGE_DIR="/opt/sickrage"
 
 post_install() {
-	getent passwd ${SB_USER} > /dev/null || useradd -U -d /opt/sickrage -s /bin/false -r ${SB_USER} > /dev/null
-
-	if grep -qr 'tvrage' /opt/sickbeard 2>/dev/null
-	then
-		echo "A previous installation of sickbeard-tvrage-git has been found."
-		if [[ ! -f /opt/sickrage/sickbeard.db ]]
-		then
-			echo "No sickrage database found; replicating leftover database from previous sickbeard-tvrage-git install."
-			mkdir -p /opt/sickrage/Logs
-			cp /opt/sickbeard/Logs/* /opt/sickrage/Logs/
-			cp /opt/sickbeard/*.db /opt/sickrage/
-			cp /opt/sickbeard/config.ini /opt/sickrage/
-		else
-			echo "A sickrage database was found; Ignoring old sickbeard-tvrage-git database"
-		fi
-		echo "/opt/sickbeard should be safe to remove after testing that sickrage is working as expected"
-	fi
-
-	chown -R ${SB_USER}. /opt/sickrage
-
-	# Create a directory in /run if it does not exist
-	if [ ! -d /run/sickrage ]; then
-		mkdir /run/sickrage
-		chown ${SB_USER}. /run/sickrage
-		chmod 775 /run/sickrage
-	fi
-
+    getent group ${SICKRAGE_GROUP} &> /dev/null || groupadd -r ${SICKRAGE_GROUP} &> /dev/null
+    getent passwd ${SICKRAGE_USER} &> /dev/null || useradd -r -g ${SICKRAGE_GROUP} -d ${SICKRAGE_DIR} -s /usr/bin/nologin ${SICKRAGE_USER} &> /dev/null
+    chown -R ${SICKRAGE_USER}:${SICKRAGE_GROUP} ${SICKRAGE_DIR}
 }
 
 post_upgrade() {
-	post_install
+  chown -R ${SICKRAGE_USER}:${SICKRAGE_GROUP} ${SICKRAGE_DIR}
 }
 
 post_remove() {
-	echo "Some files have not been removed because they are created by sickrage itself, e.g. the show database."
-	userdel -f ${SB_USER}
-	groupdel -f ${SB_USER}
+    userdel ${SICKRAGE_USER} &> /dev/null
+    groupdel ${SICKRAGE_GROUP} &> /dev/null || /bin/true
 }
diff --git a/sickrage.service b/sickrage.service
new file mode 100644
index 000000000000..4116433a37cf
--- /dev/null
+++ b/sickrage.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Sickrage service.
+After=network.target
+
+[Service]
+Restart=on-success
+User=sickrage
+Group=sickrage
+
+ExecStart=/usr/bin/env python2 /opt/sickrage/app/SickBeard.py --quiet --nolaunch --datadir /opt/sickrage/data
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sickrage.tmpfile b/sickrage.tmpfile
deleted file mode 100644
index f98578f4a2a6..000000000000
--- a/sickrage.tmpfile
+++ /dev/null
@@ -1 +0,0 @@
-d /run/sickrage 0775 sickrage sickrage