Move mylar config.ini to /var/lib/mylar.

5 files changed, 33 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d4674e42575f..67c5fc43deb3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,9 @@
 pkgbase = mylar-git
 	pkgdesc = Comic book downloader for usenet and torrents
 	pkgver = r1072.9c65a0d
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/evilhero/mylar
+	install = mylar.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
@@ -24,8 +25,8 @@ pkgbase = mylar-git
 	source = mylar.tmpfiles
 	source = mylar.sysusers
 	sha256sums = SKIP
-	sha256sums = 1d840481b2544003e10bc91e7958deabb2692249b251af7c606d025ab8477691
-	sha256sums = 8bd3e83b8fbfc781a44d37af7c2101d061e17cfe61c07e1d2cb75daecca708c8
+	sha256sums = 42f8929aed076868512dbf285d3bc1341cba57069fde8430b5ba46536085ed5f
+	sha256sums = 4d393042e6f1b7233abbefeb92f1b706d16b040e55dc92cf8bda08d34755398f
 	sha256sums = 619a6266ad56e8363296b2ae7e2428c0f433f8c73a57d9bdf55ffba179f6c81d
 
 pkgname = mylar-git
diff --git a/PKGBUILD b/PKGBUILD
index 83bee6ddeeb6..2a61563e1364 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Zeke Sonxx <zeke@zekesonxx.com>
 pkgname=mylar-git
 pkgver=r1072.9c65a0d
-pkgrel=1
+pkgrel=2
 pkgdesc="Comic book downloader for usenet and torrents"
 arch=('i686' 'x86_64')
 url="https://github.com/evilhero/mylar"
@@ -20,6 +20,7 @@ makedepends=('git')
 provides=("mylar")
 conflicts=("mylar")
 options=(!strip)
+install='mylar.install'
 
 source=('git://github.com/evilhero/mylar.git'
         'mylar.service'
@@ -27,8 +28,8 @@ source=('git://github.com/evilhero/mylar.git'
         'mylar.sysusers')
 
 sha256sums=('SKIP'
-            '1d840481b2544003e10bc91e7958deabb2692249b251af7c606d025ab8477691'
-            '8bd3e83b8fbfc781a44d37af7c2101d061e17cfe61c07e1d2cb75daecca708c8'
+            '42f8929aed076868512dbf285d3bc1341cba57069fde8430b5ba46536085ed5f'
+            '4d393042e6f1b7233abbefeb92f1b706d16b040e55dc92cf8bda08d34755398f'
             '619a6266ad56e8363296b2ae7e2428c0f433f8c73a57d9bdf55ffba179f6c81d')
 
 pkgver() {
diff --git a/mylar.install b/mylar.install
new file mode 100644
index 000000000000..ac75ec00ab16
--- /dev/null
+++ b/mylar.install
@@ -0,0 +1,24 @@
+post_upgrade() {
+  if (( $(vercmp "r1072.9c65a0d-2" "$2") > 0 )); then
+    if [[ -f /etc/mylar/config.ini && ! -f /var/lib/mylar/config.ini ]]; then
+      cp /etc/mylar/config.ini /var/lib/mylar/config.ini
+      echo "Copied config.ini from /etc/mylar/ -> /var/lib/mylar/"
+    fi
+  fi
+
+  if [[ "$( getent passwd mylar | cut -d: -f6 )" != "/var/lib/mylar" ]]; then
+    usermod -d /var/lib/mylar mylar
+    if [[ $? -ne 0 ]]; then
+      echo "Could not change mylar users home directory."
+      echo "Run: sudo systemctl stop mylar ; sudo usermod -d /var/lib/mylar mylar ; sudo systemctl start mylar"
+    fi
+  fi
+
+  if [[ -d /etc/mylar ]]; then
+    echo "Remove /etc/mylar if everything is working correctly from /var/lib/mylar now."
+  fi
+}
+
+post_install() {
+  post_upgrade "$1" "$2"
+}
diff --git a/mylar.service b/mylar.service
index 4ca76ae17208..dde2f376e326 100644
--- a/mylar.service
+++ b/mylar.service
@@ -5,7 +5,7 @@ After=network.target
 [Service]
 User=mylar
 Group=mylar
-ExecStart=/usr/bin/python2 /usr/lib/mylar/Mylar.py --nolaunch --config /etc/mylar/config.ini --datadir /var/lib/mylar
+ExecStart=/usr/bin/python2 /usr/lib/mylar/Mylar.py --nolaunch --config /var/lib/mylar/config.ini --datadir /var/lib/mylar
 
 [Install]
 WantedBy=multi-user.target
diff --git a/mylar.tmpfiles b/mylar.tmpfiles
index 07ab8e385cff..23ccc545e9c0 100644
--- a/mylar.tmpfiles
+++ b/mylar.tmpfiles
@@ -1,5 +1,3 @@
 d /var/lib/mylar 0755 mylar mylar
 Z /var/lib/mylar - mylar mylar
-d /etc/mylar 0755 mylar mylar
-Z /etc/mylar - mylar mylar
 Z /usr/lib/mylar - mylar mylar