From 8ceab0a8599974c3ed0e875354bd3c95a8c845cb Mon Sep 17 00:00:00 2001
From: Gabriel Arakaki Giovanini <mail@gabrielgio.me>
Date: Mon, 24 Apr 2023 20:42:48 +0200
Subject: fix: Move chown setup

I don't know if this is the proper way to do it but it will make easier
to build it.
---
 apks/firefly3/APKBUILD              | 15 ++++++---------
 apks/firefly3/firefly3.post-install |  5 +++--
 apks/firefly3/firefly3.pre-install  |  6 +++---
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/apks/firefly3/APKBUILD b/apks/firefly3/APKBUILD
index f4e59bc..81371c0 100644
--- a/apks/firefly3/APKBUILD
+++ b/apks/firefly3/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Gabriel Arakaki Giovanini <mail@gabrielgio.me>
 pkgname=firefly3
 pkgver=5.7.18
-pkgrel=4
+pkgrel=1
 pkgdesc="A free and open source personal finance manager"
 url="https://firefly-iii.org"
 arch="noarch"
@@ -30,7 +30,6 @@ _php_makemods="
 "
 makedepends="$_php ${_php_makemods//-/$_php-} composer"
 subpackages="
-    $pkgname-nginx:_nginx:noarch
     $pkgname-mysql:_mysql
     $pkgname-psql:_psql
     $pkgname-sqlite:_sqlite
@@ -52,16 +51,17 @@ package() {
     local lib="var/lib/$pkgname"
     local log="var/log/$pkgname"
 
-    install -d -m 770 -o firefly -g firefly "$pkgdir/$confdir"
-    install -d -m 770 -o firefly -g firefly "$pkgdir/$lib"
-    install -d -m 770 -o firefly -g firefly "$pkgdir/$log"
-
     mkdir -p "$pkgdir"
+    mkdir -p "$pkgdir/$confdir"
+    mkdir -p "$pkgdir/$lib"
+    mkdir -p "$pkgdir/$log"
+
     cd "$pkgdir"
 
     mkdir -p ./${wwwdir%/*}
     mkdir -p ./"$lib"/upload
     mkdir -p ./"$lib"/database
+
     cp -a "$builddir" ./$wwwdir
 
     chmod +x ./$wwwdir/artisan
@@ -86,9 +86,6 @@ package() {
 
     rm -r "$pkgdir"/$wwwdir/storage/logs
     ln -T -s /"$log"/ "$pkgdir"/$wwwdir/storage/logs
-
-    chown -R firefly:firefly "$pkgdir"/$wwwdir/
-    chown -R firefly:firefly  "$pkgdir/$lib"
 }
 
 _mysql() {
diff --git a/apks/firefly3/firefly3.post-install b/apks/firefly3/firefly3.post-install
index a92883d..1adcdb8 100644
--- a/apks/firefly3/firefly3.post-install
+++ b/apks/firefly3/firefly3.post-install
@@ -3,10 +3,11 @@
 printf "  *\n  * Add the configration to '/etc/firefly3/env' \n"
 printf "  * Without it firefly3 won't run.\n  *\n"
 
-user=firefly
-group=firefly
+user=firefly3
+group=firefly3
 
 chown $user:$group /usr/share/webapps/firefly3
 chown $user:$group /var/lib/firefly3
+chown $user:$group /var/log/firefly3
 
 exit 0
diff --git a/apks/firefly3/firefly3.pre-install b/apks/firefly3/firefly3.pre-install
index b9622c2..40db5b7 100644
--- a/apks/firefly3/firefly3.pre-install
+++ b/apks/firefly3/firefly3.pre-install
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-user=firefly
-group=firefly
+user=firefly3
+group=firefly3
 
 addgroup -S $group 2>/dev/null
-adduser -S -D -h /var/lib/"$user"3 -s /sbin/nologin -G $group -g $user $user 2>/dev/null
+adduser -S -D -h /var/lib/$user -s /sbin/nologin -G $group -g $user $user 2>/dev/null
 
 exit 0
-- 
cgit v1.2.3