Add python-fanart. Chown only files owned by package manager. Colored install messages.

3 files changed, 38 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4437c4602da1..e96d77e60517 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Wed Apr 19 08:43:33 UTC 2017
 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.4.r0
-	pkgrel = 2
+	pkgver = 9.0.12.r0
+	pkgrel = 1
 	url = https://github.com/SiCKRAGETV/SickRage
 	install = sickrage-pip.install
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index bf5a0fbc6a61..0fd1df68ac59 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,13 @@
 
 _pkgname=sickrage
 pkgname=$_pkgname-pip
-pkgver=8.9.4.r0
-pkgrel=2
+pkgver=9.0.12.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')
+##makedepends=('python2-virtualenv')
 depends=('python2-virtualenv')
 #         'deluge: supported torrent client'
 #         'qbittorrent: supported torrent client'
@@ -42,5 +43,13 @@ package() {
   install -Dm644 sickrage.tmpfile "$pkgdir/usr/lib/tmpfiles.d/sickrage.conf"
 
   install -dm755 "$pkgdir"/opt/sickrage/{app,data}
+
+  ##virtualenv2 "$pkgdir/opt/sickrage/app"
+  ### Patch: add extra dependencies
+  ###"$pkgdir/opt/sickrage/app/bin/pip2" install --isolated sickrage
+  ##"$pkgdir/opt/sickrage/app/bin/pip2" install --isolated sickrage lxml pyopenssl python-fanart
+  ##
+  ##find "$pkgdir"/opt/sickrage/app/lib/python*/site-packages/sickrage -name "*.py" -exec \
+  ##    sed -i "s|\('pip_path'.*\)'pip'|\1'/opt/sickrage/app/bin/pip2'|" '{}' \;
 }
 
diff --git a/sickrage-pip.install b/sickrage-pip.install
index 3662a1608ba4..84dbfcb02bee 100644
--- a/sickrage-pip.install
+++ b/sickrage-pip.install
@@ -1,4 +1,13 @@
-_patch_pip_path() {
+# Colored makepkg-like functions
+note() {
+    printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
+}
+all_off="$(tput sgr0)"
+bold="${all_off}$(tput bold)"
+blue="${bold}$(tput setaf 4)"
+yellow="${bold}$(tput setaf 3)"
+
+patch_pip_path() {
   find /opt/sickrage/app/lib/python*/site-packages/sickrage -name "*.py" -exec \
       sed -i "s|\('pip_path'.*\)'pip'|\1'/opt/sickrage/app/bin/pip2'|" '{}' \;
 }
@@ -6,20 +15,25 @@ _patch_pip_path() {
 post_install() {
   systemd-sysusers sickrage.conf
   systemd-tmpfiles --create sickrage.conf
-  chown -R sickrage:sickrage /opt/sickrage
+  chown sickrage:sickrage /opt/sickrage/{,data}
+  chown -R sickrage:sickrage /opt/sickrage/app
 
   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
+  # Patch: add extra dependencies
+  #su -s /bin/bash sickrage -c "/opt/sickrage/app/bin/pip2 install --isolated sickrage"
+  su -s /bin/bash sickrage -c "/opt/sickrage/app/bin/pip2 install --isolated sickrage lxml pyopenssl python-fanart"
+  patch_pip_path
 
   echo
-  echo "==> Configuration files have moved to /opt/sickrage/data. To migrate, run the following commands as root and then reinstall:"
+  note "Configuration files have moved to /opt/sickrage/data."
+  echo "    To migrate, run the following commands as root and then reinstall:"
   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 "        mkdir -p /opt/sickrage/data"
   echo "        mv /opt/sickrage/* /opt/sickrage/data/"
+  ##note "If an upgrade fails with \"error: failed to commit transaction (conflicting files)\", then uninstall first."
   echo "==> Start and enable sickrage.service. Then visit http://localhost:8081/"
 }
 
@@ -27,8 +41,10 @@ post_upgrade() {
   if [ ! -d /opt/sickrage/app ]; then
     post_install $1
   else
-    su -s /bin/bash sickrage -c "/opt/sickrage/app/bin/pip2 install --isolated --upgrade sickrage lxml pyopenssl"
-    _patch_pip_path
+    # Patch: add extra dependencies
+    #su -s /bin/bash sickrage -c "/opt/sickrage/app/bin/pip2 install --isolated --upgrade sickrage"
+    su -s /bin/bash sickrage -c "/opt/sickrage/app/bin/pip2 install --isolated --upgrade sickrage lxml pyopenssl python-fanart"
+    patch_pip_path
   fi
 }