diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 18 | ||||
-rw-r--r-- | sickrage-pip.install | 41 | ||||
-rw-r--r-- | sickrage.service | 4 |
4 files changed, 39 insertions, 28 deletions
@@ -1,6 +1,6 @@ pkgbase = sickrage-pip pkgdesc = A PVR application that downloads and manages your TV shows. Echel0n fork of sickbeard, with tvrage, torrents and anime support. - pkgver = 8.9.2.r0 + pkgver = 8.9.4.r0 pkgrel = 1 url = https://github.com/SiCKRAGETV/SickRage install = sickrage-pip.install @@ -14,7 +14,7 @@ pkgbase = sickrage-pip source = sickrage.service source = sickrage.sysusers source = sickrage.tmpfile - md5sums = 3d67651fa77e6f2a0c37a995ad20bc2f + md5sums = eb76e8676e0a2169364cb0041b0fb6f4 md5sums = 6a7db7e14e74072d29e482b06b41dfa7 md5sums = f7a12df978d649da4e77d88e03f50252 @@ -4,18 +4,18 @@ _pkgname=sickrage pkgname=$_pkgname-pip -pkgver=8.9.2.r0 +pkgver=8.9.4.r0 pkgrel=1 pkgdesc="A PVR application that downloads and manages your TV shows. Echel0n fork of sickbeard, with tvrage, torrents and anime support." arch=('any') url="https://github.com/SiCKRAGETV/SickRage" license=('GPL3') depends=('python2-virtualenv') -# 'deluge: supported torrent client' -# 'qbittorrent: supported torrent client' -# 'rtorrent: supported torrent client' -# 'sabnzbd: supported NZB downloader' -# 'transmission-cli: supported torrent client' +# 'deluge: supported torrent client' +# 'qbittorrent: supported torrent client' +# 'rtorrent: supported torrent client' +# 'sabnzbd: supported NZB downloader' +# 'transmission-cli: supported torrent client' optdepends=('unrar: RAR archives') provides=($_pkgname) conflicts=($_pkgname) @@ -24,10 +24,12 @@ install=$pkgname.install source=('sickrage.service' 'sickrage.sysusers' 'sickrage.tmpfile') -md5sums=('3d67651fa77e6f2a0c37a995ad20bc2f' +md5sums=('eb76e8676e0a2169364cb0041b0fb6f4' '6a7db7e14e74072d29e482b06b41dfa7' 'f7a12df978d649da4e77d88e03f50252') +export PIP_DEFAULT_TIMEOUT=60 + pkgver() { #pip2 search $_pkgname | awk '$1 == "sickrage" { gsub("[()]", ""); print $2 ".r0" }' #curl -s https://pypi.python.org/pypi/$_pkgname/json | grep version | head -1 | awk -F: '{ print $2 }' | awk -F'"' '$0=$2 ".r0"' @@ -38,5 +40,7 @@ package() { install -Dm644 sickrage.service "$pkgdir/usr/lib/systemd/system/sickrage.service" install -Dm644 sickrage.sysusers "$pkgdir/usr/lib/sysusers.d/sickrage.conf" install -Dm644 sickrage.tmpfile "$pkgdir/usr/lib/tmpfiles.d/sickrage.conf" + + install -dm755 "$pkgdir"/opt/sickrage/{app,data} } diff --git a/sickrage-pip.install b/sickrage-pip.install index b487c4bcf968..4bed3891402b 100644 --- a/sickrage-pip.install +++ b/sickrage-pip.install @@ -1,40 +1,47 @@ _patch_pip_path() { - find /opt/sickrage/lib/python*/site-packages/sickrage -name "*.py" -exec \ - sed -i "s|\('pip_path'.*\)'pip'|\1'/opt/sickrage/bin/pip2'|" '{}' \; + find /opt/sickrage/app/lib/python*/site-packages/sickrage -name "*.py" -exec \ + sed -i "s|\('pip_path'.*\)'pip'|\1'/opt/sickrage/app/bin/pip2'|" '{}' \; } post_install() { systemd-sysusers sickrage.conf - systemd-tmpfiles --create sickgear.conf - mkdir /opt/sickrage + systemd-tmpfiles --create sickrage.conf chown -R sickrage:sickrage /opt/sickrage - sudo -u sickrage virtualenv2 /opt/sickrage - sudo -u sickrage /opt/sickrage/bin/pip2 install --isolated sickrage lxml pyopenssl + + su -s /bin/bash sickrage -c "virtualenv2 /opt/sickrage/app" + su -s /bin/bash sickrage -c "/opt/sickrage/app/bin/pip2 install --isolated sickrage lxml pyopenssl" _patch_pip_path + + echo + echo "==> Configuration files have moved to /opt/sickrage/data. To migrate, run the following commands as root:" + echo " systemctl stop sickrage.service" + echo " pacman -Rn sickrage-pip" + echo " cp -a /opt/sickrage{,.bak}" + echo ' rm -r $(ls -1d /opt/sickrage/* | grep -Ev "/backup.*|/cache.*|/config.ini.*|/Log.*|/.*\.db.*")' + echo " mv /opt/sickrage/* /opt/sickrage/data/" echo "==> Start and enable sickrage.service. Then visit http://localhost:8081/" } post_upgrade() { - if [ ! -d /opt/sickrage ]; then + if [ ! -d /opt/sickrage/app ]; then post_install $1 else - sudo -u sickrage /opt/sickrage/bin/pip2 install --isolated --upgrade sickrage lxml pyopenssl + su -s /bin/bash sickrage -c "/opt/sickrage/app/bin/pip2 install --isolated --upgrade sickrage lxml pyopenssl" _patch_pip_path fi } +pre_remove() { + systemctl stop sickrage.service +} + post_remove() { - sudo -u sickrage /opt/sickrage/bin/pip2 uninstall --isolated --yes $(/opt/sickrage/bin/pip2 list --isolated | awk '{ print $1 }') - systemctl --quiet is-active sickrage.service - if [ $? -eq 0 ]; then - systemctl stop sickrage.service - fi - sudo -u sickrage virtualenv2 --no-wheel --no-setuptools --no-pip --clear --no-download /opt/sickrage + rm -rf /opt/sickrage/app - echo -e "\n==> Some files in /opt/sickrage may not have been removed.\n" + echo "==> To delete the configuration files, run as root: rm -rf /opt/sickrage/data" # Do not delete the 'sickrage' user automatically. It may still own files. - # If 'sickrage' is the only user in group 'sickrage', then the group will also be deleted. - echo "==> To delete the 'sickrage' user, run as root: userdel --force sickrage" + # If 'sickrage' is the only user in group 'sickrage', then userdel will also delete the group. + echo "==> To delete the \"sickrage\" user, run as root: userdel --force sickrage" } diff --git a/sickrage.service b/sickrage.service index eebbbb8dbab8..899055b9156f 100644 --- a/sickrage.service +++ b/sickrage.service @@ -9,8 +9,8 @@ Group=sickrage #Type=forking #PIDFile=/run/sickrage/sickrage.pid -#ExecStart=/opt/sickrage/bin/sickrage -q --nolaunch --daemon --config /opt/sickrage/config.ini --datadir /opt/sickrage --pidfile=/run/sickrage/sickrage.pid -ExecStart=/opt/sickrage/bin/sickrage -q --nolaunch --config /opt/sickrage/config.ini --datadir /opt/sickrage +#ExecStart=/opt/sickrage/app/bin/sickrage -q --nolaunch --daemon --datadir /opt/sickrage/data --pidfile=/run/sickrage/sickrage.pid +ExecStart=/opt/sickrage/app/bin/sickrage -q --nolaunch --datadir /opt/sickrage/data [Install] WantedBy=multi-user.target |