1diff --git a/apks/firefly3/APKBUILD b/apks/firefly3/APKBUILD
2index f4e59bc07a75d81a7e50e1a3f3be819fe921b1bf..81371c0eb3cafa11e85c6a4792eae252cb08700b 100644
3--- a/apks/firefly3/APKBUILD
4+++ b/apks/firefly3/APKBUILD
5@@ -1,7 +1,7 @@
6 # Maintainer: Gabriel Arakaki Giovanini <mail@gabrielgio.me>
7 pkgname=firefly3
8 pkgver=5.7.18
9-pkgrel=4
10+pkgrel=1
11 pkgdesc="A free and open source personal finance manager"
12 url="https://firefly-iii.org"
13 arch="noarch"
14@@ -30,7 +30,6 @@ -simplexml
15 "
16 makedepends="$_php ${_php_makemods//-/$_php-} composer"
17 subpackages="
18- $pkgname-nginx:_nginx:noarch
19 $pkgname-mysql:_mysql
20 $pkgname-psql:_psql
21 $pkgname-sqlite:_sqlite
22@@ -52,16 +51,17 @@ local confdir="etc/$pkgname"
23 local lib="var/lib/$pkgname"
24 local log="var/log/$pkgname"
25
26- install -d -m 770 -o firefly -g firefly "$pkgdir/$confdir"
27- install -d -m 770 -o firefly -g firefly "$pkgdir/$lib"
28- install -d -m 770 -o firefly -g firefly "$pkgdir/$log"
29+ mkdir -p "$pkgdir"
30+ mkdir -p "$pkgdir/$confdir"
31+ mkdir -p "$pkgdir/$lib"
32+ mkdir -p "$pkgdir/$log"
33
34- mkdir -p "$pkgdir"
35 cd "$pkgdir"
36
37 mkdir -p ./${wwwdir%/*}
38 mkdir -p ./"$lib"/upload
39 mkdir -p ./"$lib"/database
40+
41 cp -a "$builddir" ./$wwwdir
42
43 chmod +x ./$wwwdir/artisan
44@@ -86,9 +86,6 @@ ln -s /"$lib"/oauth-public.key "$pkgdir"/$wwwdir/storage/oauth-public.key
45
46 rm -r "$pkgdir"/$wwwdir/storage/logs
47 ln -T -s /"$log"/ "$pkgdir"/$wwwdir/storage/logs
48-
49- chown -R firefly:firefly "$pkgdir"/$wwwdir/
50- chown -R firefly:firefly "$pkgdir/$lib"
51 }
52
53 _mysql() {
54diff --git a/apks/firefly3/firefly3.post-install b/apks/firefly3/firefly3.post-install
55index a92883d15c27ef04f278ed1613081909a2e2ab68..1adcdb8235a26760fd49dd7c5cf09caff454cdc2 100644
56--- a/apks/firefly3/firefly3.post-install
57+++ b/apks/firefly3/firefly3.post-install
58@@ -3,10 +3,11 @@
59 printf " *\n * Add the configration to '/etc/firefly3/env' \n"
60 printf " * Without it firefly3 won't run.\n *\n"
61
62-user=firefly
63-group=firefly
64+user=firefly3
65+group=firefly3
66
67 chown $user:$group /usr/share/webapps/firefly3
68 chown $user:$group /var/lib/firefly3
69+chown $user:$group /var/log/firefly3
70
71 exit 0
72diff --git a/apks/firefly3/firefly3.pre-install b/apks/firefly3/firefly3.pre-install
73index b9622c23d2a1f76a085281683c2d2d54e904a975..40db5b7f76c1dea0aa30d9efb2cb494993fe7bee 100644
74--- a/apks/firefly3/firefly3.pre-install
75+++ b/apks/firefly3/firefly3.pre-install
76@@ -1,9 +1,9 @@
77 #!/bin/sh
78
79-user=firefly
80-group=firefly
81+user=firefly3
82+group=firefly3
83
84 addgroup -S $group 2>/dev/null
85-adduser -S -D -h /var/lib/"$user"3 -s /sbin/nologin -G $group -g $user $user 2>/dev/null
86+adduser -S -D -h /var/lib/$user -s /sbin/nologin -G $group -g $user $user 2>/dev/null
87
88 exit 0