From f537e649e4d9c3b5041d90932b5735a15f1db425 Mon Sep 17 00:00:00 2001
From: DarkFeather <ircs://aninix.net:6697/DarkFeather>
Date: Sat, 14 Oct 2023 13:33:51 -0500
Subject: [PATCH] Updating to fix packaging

---
 Makefile      | 21 ++++++++++++---------
 raven.service |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index e5efb13..ab10742 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
 CONFDIR = ${pkgdir}/usr/local/etc/TheRaven
+INSTALLDIR = ${pkgdir}/opt/aninix/TheRaven
+SCRIPTS != ls -1 *.bash
 
 compile: clean ./chatbot-support.bash ./math-support.bash
 	(mcs -out:raven.mono /opt/aninix/Uniglot/CSharp/*.csharp *.csharp Raven.csharp 2>&1 | grep -v CS2002); printf ""
@@ -10,8 +12,9 @@ test: compile
 	cd ./sample-confs; mono ../raven.mono -c sample.conf -v -h
 
 install: compile 
-	mkdir -p ${pkgdir}/opt
-	cp raven.mono ${pkgdir}/opt/raven.mono
+	source $$PWD/installscript && pre_install || true
+	install -o raven -g raven -m 0750 -d ${INSTALLDIR}
+	for script in ${SCRIPTS} raven.mono; do install -o raven -g raven -m 0640 $$script ${INSTALLDIR}; done
 	if [ ! -d ${CONFDIR} ]; then mkdir -p ${CONFDIR}; cp sample-confs/* ${CONFDIR}; fi
 	# Hook to deprivilege bot
 	make checkperm
@@ -19,14 +22,14 @@ install: compile
 	mkdir -p ${pkgdir}/usr/lib/systemd/system/
 	cp ./raven.service ${pkgdir}/usr/lib/systemd/system/raven.service
 
-reverse: ${pkgdir}/usr/lib/systemd/system/raven.service
-	cp  ${pkgdir}/usr/lib/systemd/system/raven.service .
+reverse: /usr/lib/systemd/system/raven.service /usr/local/etc/TheRaven
+	cp /usr/lib/systemd/system/raven.service .
+	cp ${INSTALLDIR}/*.bash .
 
-checkperm: ${pkgdir}/opt/raven.mono
-	if ! id raven; then sudo useradd raven; echo User raven added; fi
-	chown -R raven:raven ${pkgdir}/opt/raven.mono ${CONFDIR}*
-	chmod 0600 ${pkgdir}/opt/raven.mono ${CONFDIR}*/*
-	chmod 0700 ${CONFDIR}*
+checkperm: ${INSTALLDIR}/raven.mono
+	chown -R raven:raven ${INSTALLDIR} ${CONFDIR}
+	chmod 0600 ${INSTALLDIR}/* ${CONFDIR}/*
+	chmod 0700 ${CONFDIR} ${INSTALLDIR}
     
 diff: 
 	diff ./raven.service ${pkgdir}/usr/lib/systemd/system/raven.service
diff --git a/raven.service b/raven.service
index 7e32061..5182ce6 100644
--- a/raven.service
+++ b/raven.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 WorkingDirectory=/usr/local/etc/TheRaven
-ExecStart=/usr/bin/mono /opt/raven.mono -c raven.conf
+ExecStart=/usr/bin/mono /opt/aninix/TheRaven/raven.mono -c raven.conf
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=always