upgpkg: jotta-cli 0.4.4986-3

Updated jotta-cli

Signed-off-by: Morten Linderud <morten@linderud.pw>

4 files changed, 35 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31c11b8afaf8..701197e20c8e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
+# Generated by mksrcinfo v8
+# Sun Apr 22 19:04:13 UTC 2018
 pkgbase = jotta-cli
 	pkgdesc = Jottacloud command line client to back up/share your files to/on Jottacloud.
-	pkgver = 0.4.4914
+	pkgver = 0.4.4986
 	pkgrel = 3
 	url = http://docs.jottacloud.com/jottacloud-command-line-tool
 	arch = x86_64
 	arch = i686
 	license = custom: (C) Jotta AS 2018
-	depends = systemd
-	depends = glibc
-	provides = jotta-cli
-	options = !strip
-	options = !upx
-	source_x86_64 = https://repo.jotta.us/debian/pool/main/j/jotta-cli/jotta-cli_0.4.4914_amd64.deb
-	sha256sums_x86_64 = 3882cea8ba0af218e4fc959effa02bf8eb58e9c88ceadd2f4a2aca549a82b6bb
-	source_i686 = https://repo.jotta.us/debian/pool/main/j/jotta-cli/jotta-cli_0.4.4914_i386.deb
-	sha256sums_i686 = 4ca3271901c734c9994e7726b81aa11a03ceabcb1e92b534ac20429974ba6d92
+	source = jotta-cli.sysusers
+	source = jotta-cli.tmpfiles
+	sha256sums = 236b77504910d1e9c2bec69bd73d49ce9e9ca21dfd26cf0c69a212fe370bbe2d
+	sha256sums = 2f686a82aafbb9b2168303907b2fe623fe4635ff314583dfb38ad747e0a0e450
+	source_x86_64 = https://repo.jotta.us/debian/pool/main/j/jotta-cli/jotta-cli_0.4.4986_amd64.deb
+	sha256sums_x86_64 = e6497d8425d8ababbc0ccc50edc617e5a44a19a05f9bee3ce2672437c7871222
+	source_i686 = https://repo.jotta.us/debian/pool/main/j/jotta-cli/jotta-cli_0.4.4986_i386.deb
+	sha256sums_i686 = 9a5e1558ecb569bd88e34e622e50809ea3dd75950525af82cea4c737ebf0a247
 
 pkgname = jotta-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index f49cd830eed9..b40ad6cbb4bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,46 +1,39 @@
 # Maintainer: Joakim Nylen (jnylen) <me@jnylen.nu>
 
 pkgname=jotta-cli
-pkgver=0.4.4914
+pkgver=0.4.4986
 pkgrel=3
 pkgdesc="Jottacloud command line client to back up/share your files to/on Jottacloud."
-makedepends=()
 arch=('x86_64' 'i686')
 license=('custom: (C) Jotta AS 2018')
 url="http://docs.jottacloud.com/jottacloud-command-line-tool"
-options=('!strip' '!upx')
-
-provides=('jotta-cli')
-conflicts=()
-
-sha256sums_x86_64=('3882cea8ba0af218e4fc959effa02bf8eb58e9c88ceadd2f4a2aca549a82b6bb')
-sha256sums_i686=('4ca3271901c734c9994e7726b81aa11a03ceabcb1e92b534ac20429974ba6d92')
 
+source=("jotta-cli.sysusers"
+        "jotta-cli.tmpfiles")
 source_x86_64=("https://repo.jotta.us/debian/pool/main/j/jotta-cli/jotta-cli_${pkgver}_amd64.deb")
-
 source_i686=("https://repo.jotta.us/debian/pool/main/j/jotta-cli/jotta-cli_${pkgver}_i386.deb")
-
-depends=('systemd' 'glibc')
-optdepends=()
+sha256sums=('236b77504910d1e9c2bec69bd73d49ce9e9ca21dfd26cf0c69a212fe370bbe2d'
+            '2f686a82aafbb9b2168303907b2fe623fe4635ff314583dfb38ad747e0a0e450')
+sha256sums_x86_64=('e6497d8425d8ababbc0ccc50edc617e5a44a19a05f9bee3ce2672437c7871222')
+sha256sums_i686=('9a5e1558ecb569bd88e34e622e50809ea3dd75950525af82cea4c737ebf0a247')
 
 package() {
     cd ${srcdir}
-
     tar -xvf data.tar.gz -C ${pkgdir} --exclude='./control'
 
-    mv "${pkgdir}"/etc "${pkgdir}"/usr/etc
-
-    chmod -R go-w "${pkgdir}"/usr
-}
-
-post_install() {
-    echo "Enabling systemd services"
-    systemctl enable jottad.service
-    echo "Starting systemd services"
-    systemctl start jottad.service
+    install -Dm644 "${pkgdir}/usr/share/jottad/systemd/default/files/etc/systemd/system/jottad.service" \
+        "${pkgdir}/usr/lib/systemd/system/jottad.service"
+    install -Dm644 "${pkgdir}/usr/share/jottad/systemd/default/files/etc/default/jottad" \
+        "${pkgdir}/etc/default/jottad"
+    rm -rf "${pkgdir}/usr/share/jottad"
+
+    install -Dm644 "${srcdir}"/$pkgname.sysusers \
+        "${pkgdir}"/usr/lib/sysusers.d/$pkgname.conf
+    install -Dm644 "${srcdir}"/$pkgname.tmpfiles \
+        "${pkgdir}"/usr/lib/tmpfiles.d/$pkgname.conf
+
+    # chmod fixes
+    chmod 755 "$pkgdir/usr/bin" 
+    chmod 755 "$pkgdir/etc/jottad"
+    chmod 644 "$pkgdir/etc/jottad/config.ini"
 }
-
-post_upgrade() {
-    echo "Reloading systemd"
-    systemctl daemon-reload
-}
\ No newline at end of file
diff --git a/jotta-cli.sysusers b/jotta-cli.sysusers
new file mode 100644
index 000000000000..c63a55bc5de7
--- /dev/null
+++ b/jotta-cli.sysusers
@@ -0,0 +1 @@
+u jottad - - /var/lib/jottad
diff --git a/jotta-cli.tmpfiles b/jotta-cli.tmpfiles
new file mode 100644
index 000000000000..6d9fef94934a
--- /dev/null
+++ b/jotta-cli.tmpfiles
@@ -0,0 +1 @@
+d /var/lib/jottad - jottad jottad - -