From cd5507e5e8504438aef9037e11eb96e8ab265b45 Mon Sep 17 00:00:00 2001
From: maxice8 <thinkabit.ukim@gmail.com>
Date: Sat, 26 Jan 2019 20:49:17 -0200
Subject: [PATCH] monkey: simplify directory creation

---
 srcpkgs/monkey/files/monkey/run | 14 --------------
 srcpkgs/monkey/template         | 19 +++++++++++--------
 2 files changed, 11 insertions(+), 22 deletions(-)
 mode change 100755 => 100644 srcpkgs/monkey/files/monkey/run

diff --git a/srcpkgs/monkey/files/monkey/run b/srcpkgs/monkey/files/monkey/run
old mode 100755
new mode 100644
index f1690cd5452..f499f3d2507
--- a/srcpkgs/monkey/files/monkey/run
+++ b/srcpkgs/monkey/files/monkey/run
@@ -1,16 +1,2 @@
 #!/bin/sh
-[ -s conf ] && . ./conf
-
-: ${ROOTDIR:=/srv/www/monkey}
-: ${LOGDIR:=/var/log/monkey}
-
-if [ ! -d $ROOTDIR ]; then
-	mkdir -p $ROOTDIR
-	chown _monkey:_monkey $ROOTDIR
-fi
-if [ ! -d $LOGDIR ]; then
-	mkdir -p $LOGDIR/htdocs
-	chown _monkey:_monkey -R $LOGDIR
-fi
-
 exec chpst -u monkey:monkey monkey
diff --git a/srcpkgs/monkey/template b/srcpkgs/monkey/template
index fa58f338c6e..ba04d61f5c6 100644
--- a/srcpkgs/monkey/template
+++ b/srcpkgs/monkey/template
@@ -1,15 +1,14 @@
 # Template file for 'monkey'
 pkgname=monkey
 version=1.6.9
-revision=1
+revision=2
 build_style=configure
+configure_args="--prefix=/usr --sbindir=/usr/bin --libdir=/usr/lib
+ --sysconfdir=/etc/monkey/ --enable-plugins=mbedtls --malloc-libc
+ --webroot=/srv/www/$pkgname --mandir=/usr/share/man --default-user=_monkey
+ --pidfile=/var/run/monkey.pid --logdir=/var/log/monkey"
 hostmakedepends="cmake"
 makedepends="mbedtls-devel"
-configure_args+="--prefix=/usr --sbindir=/usr/bin --libdir=/usr/lib "
-configure_args+="--sysconfdir=/etc/monkey/ --enable-plugins=mbedtls "
-configure_args+="--webroot=/srv/www/$pkgname --mandir=/usr/share/man "
-configure_args+="--pidfile=/var/run/monkey.pid --logdir=/var/log/monkey "
-configure_args+="--malloc-libc --default-user=_$pkgname "
 short_desc="Cross-arch embeddable lightweight HTTP server"
 maintainer="necrophcodr <necrophcodr@necrophcodr.me>"
 license="Apache-2.0"
@@ -25,8 +24,12 @@ conf_files="
  /etc/monkey/plugins.load
  /etc/monkey/monkey.mime"
 
-system_accounts="_$pkgname"
-_monkey_homedir="/srv/www/$pkgname"
+system_accounts="_monkey"
+_monkey_homedir="/srv/www/_monkey"
+
+make_dirs="
+ /srv/www/monkey 0755 _monkey _monkey
+ /var/log/monkey/htdocs 0755 _monkey _monkey"
 
 case $XBPS_TARGET_MACHINE in
 	*-musl) configure_args+="--musl-mode --no-backtrace ";;