From baed11391f8e73b9d1810679bb5765f371f58347 Mon Sep 17 00:00:00 2001
From: Donald Webster <fryfrog@gmail.com>
Date: Sun, 18 Mar 2018 12:45:34 -0700
Subject: [PATCH] Use tmpfiles more, check jackett user home dir at every
 upgrade, suggest fix.

---
 .SRCINFO        |  2 +-
 .gitignore      |  1 +
 PKGBUILD        |  2 +-
 jackett.install | 22 +++++++---------------
 jackett.tmpfile |  2 ++
 5 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 682d4e038c9..7b427076507 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,7 +15,7 @@ pkgbase = jackett
 	sha256sums = fa9882b6d2d415185dbfa2768e09db27f26264983de3b46948ef40b6466f7fad
 	sha256sums = 75837fe04f5afd30cdbdd3349bb27b43994dc672202f886382903f7fbc92dc89
 	sha256sums = d005fcd009ec5404e1ec88246c31e664167f5551d6cabc35f68eb41750bfe590
-	sha256sums = 289b7ea9394fe7d97a2fb8fdc1e67168ab7858ed2aa8fa881038eb70666ddec3
+	sha256sums = 79ec8a9a072c3ca69556102edc50ad97fc65565d18b19ff054993a176e8e3898
 
 pkgname = jackett
 
diff --git a/.gitignore b/.gitignore
index 126ef55ce32..6e570bc49ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.xz
 *.gz
+*.log
 /src/
 /pkg/
diff --git a/PKGBUILD b/PKGBUILD
index a927add9bc8..ed7489d0ff3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ source=("Jackett.Binaries.Mono-${pkgver}.tar.gz::https://github.com/Jackett/Jack
 sha256sums=('fa9882b6d2d415185dbfa2768e09db27f26264983de3b46948ef40b6466f7fad'
             '75837fe04f5afd30cdbdd3349bb27b43994dc672202f886382903f7fbc92dc89'
             'd005fcd009ec5404e1ec88246c31e664167f5551d6cabc35f68eb41750bfe590'
-            '289b7ea9394fe7d97a2fb8fdc1e67168ab7858ed2aa8fa881038eb70666ddec3')
+            '79ec8a9a072c3ca69556102edc50ad97fc65565d18b19ff054993a176e8e3898')
 
 package() {
     cd "$srcdir"
diff --git a/jackett.install b/jackett.install
index ce886756fb1..a2917f39408 100644
--- a/jackett.install
+++ b/jackett.install
@@ -1,12 +1,7 @@
-post_install() {
-  chown -R jackett: /usr/lib/jackett
-}
-
 post_upgrade() {
   # At version 0.8.749-2 we moved configs to /var/lib/jackett, so
   # migrate old config directory.
   if [[ $(vercmp "0.8.749-2" "$2") -eq 1 ]]; then
-
     # Check for existing old config directory and non-existance of new config file.
     if [[ -d /usr/share/Jackett/.config/Jackett && ! -f /var/lib/jackett/ServerConfig.json ]]; then
       cp -a /usr/share/Jackett/.config/Jackett/* /var/lib/jackett/
@@ -17,18 +12,15 @@ post_upgrade() {
       cp -a /usr/share/Jackett/.config/.mono /var/lib/jackett/
     fi
 
-    # Stop jackett so user's home directory can be changed.
-    systemctl stop jackett
-    if [[ "$( getent passwd jackett | cut -d: -f6 )" != "/var/lib/jackett" ]]; then
-      usermod -d /var/lib/jackett jackett
-    fi
-
     echo "Configs copied from /usr/share/Jackett/.config/Jackett -> /var/lib/jackett/."
     echo "After confirming, rm -rf /opt/Jackett /usr/share/Jackett."
-    echo
-    echo "To modify jackett user's home directory, the jackett service was stopped."
-    echo "Start it again by running: sudo systemctl start jackett"
   fi
 
-  post_install "$1"
+  if [[ "$( getent passwd jackett | cut -d: -f6 )" != "/var/lib/jackett" ]]; then
+    usermod -d /var/lib/jackett jackett
+    if [[ $? -ne 0 ]]; then
+      echo "Could not change jackett users home directory."
+      echo "Run: sudo systemctl stop jackett ; sudo usermod -d /var/lib/jackett jackett ; sudo systemctl start jackett"
+    fi
+  fi
 }
diff --git a/jackett.tmpfile b/jackett.tmpfile
index f39d2b0a8ee..ca5e6f4417e 100644
--- a/jackett.tmpfile
+++ b/jackett.tmpfile
@@ -1 +1,3 @@
 d /var/lib/jackett 0755 jackett jackett
+Z /var/lib/jackett - jackett jackett
+Z /usr/lib/jackett - jackett jackett