From cbdbcf860c7f98ccda59d6a5574f9fad8461655f Mon Sep 17 00:00:00 2001
From: abraunegg <alex.braunegg@gmail.com>
Date: Sat, 14 Apr 2018 08:29:31 +1000
Subject: [PATCH] Update makefile and sample spec

* Include the user onedrive service file in makefile & spec
* Ensure that when 'make install' is done, the logfile path is created
with correct permissions
* Ensure that when RPM package is installed, the logfile path is created
with correct permissions
---
 Makefile           |  6 ++++++
 spec/onedrive.spec | 17 +++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index e7f22bc2..ffa79f6a 100644
--- a/Makefile
+++ b/Makefile
@@ -24,16 +24,22 @@ clean:
 install: all
 	install -D onedrive $(DESTDIR)$(PREFIX)/bin/onedrive
 	install -D -m 644 onedrive.service $(DESTDIR)/usr/lib/systemd/user/onedrive.service
+	install -D -m 644 onedrive@.service $(DESTDIR)/usr/lib/systemd/user/onedrive@.service
+	mkdir -p /var/log/onedrive
+	chown root.users /var/log/onedrive
+	chmod 0775 /var/log/onedrive
 
 onedrive: version $(SOURCES)
 	$(DC) $(DFLAGS) $(SOURCES)
 
 onedrive.service:
 	sed "s|@PREFIX@|$(PREFIX)|g" systemd.units/onedrive.service.in > onedrive.service
+	sed "s|@PREFIX@|$(PREFIX)|g" systemd.units/onedrive@.service.in > onedrive@.service
 
 uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/bin/onedrive
 	rm -f $(DESTDIR)/usr/lib/systemd/user/onedrive.service
+	rm -f $(DESTDIR)/usr/lib/systemd/user/onedrive@.service
 
 version: .git/HEAD .git/index
 	echo $(shell git describe --tags) >version
\ No newline at end of file
diff --git a/spec/onedrive.spec b/spec/onedrive.spec
index 91c3dcf7..f9a411a4 100644
--- a/spec/onedrive.spec
+++ b/spec/onedrive.spec
@@ -55,12 +55,13 @@ make
 cp %{_builddir}/%{name}-%{version}/onedrive %{buildroot}/usr/bin/onedrive
 cp %{_builddir}/%{name}-%{version}/logrotate/onedrive.logrotate %{buildroot}/etc/logrotate.d/onedrive
 %if 0%{?with_systemd}
-%{__mkdir_p} %{buildroot}/usr/lib/systemd/user/
-cp %{_builddir}/%{name}-%{version}/onedrive.service %{buildroot}/usr/lib/systemd/user/onedrive.service
+%{__mkdir_p} %{buildroot}/%{_unitdir}
+cp %{_builddir}/%{name}-%{version}/onedrive.service %{buildroot}/%{_unitdir}/onedrive.service
+cp %{_builddir}/%{name}-%{version}/onedrive.service %{buildroot}/%{_unitdir}/onedrive@.service
 %else
-%{__mkdir_p} %{buildroot}/etc/init.d
+%{__mkdir_p} %{buildroot}/%{_initrddir}
 cp %{_builddir}/%{name}-%{version}/init.d/onedrive_service.sh %{buildroot}/usr/bin/onedrive_service.sh
-cp %{_builddir}/%{name}-%{version}/init.d/onedrive.init %{buildroot}/etc/init.d/onedrive
+cp %{_builddir}/%{name}-%{version}/init.d/onedrive.init %{buildroot}/%{_initrddir}/onedrive
 %endif
 
 %clean
@@ -70,10 +71,11 @@ cp %{_builddir}/%{name}-%{version}/init.d/onedrive.init %{buildroot}/etc/init.d/
 %attr(0555,root,root) /usr/bin/onedrive
 %attr(0644,root,root) /etc/logrotate.d/onedrive
 %if 0%{?with_systemd}
-%attr(0555,root,root) /usr/lib/systemd/user/onedrive.service
+%attr(0555,root,root) %{_unitdir}/onedrive.service
+%attr(0555,root,root) %{_unitdir}/onedrive@.service
 %else
 %attr(0555,root,root) /usr/bin/onedrive_service.sh
-%attr(0555,root,root) /etc/init.d/onedrive
+%attr(0555,root,root) %{_initrddir}/onedrive
 %endif
 
 %pre
@@ -84,6 +86,9 @@ rm -f /root/.config/onedrive/resume_upload
 %post
 mkdir -p /root/.config/onedrive
 mkdir -p /root/OneDrive
+mkdir -p /var/log/onedrive
+chown root.users /var/log/onedrive
+chmod 0775 /var/log/onedrive
 %if 0%{?with_systemd}
 %systemd_post onedrive.service
 %else