From cb6203ff8288b558fea5c635239c8fa96ae1f998 Mon Sep 17 00:00:00 2001
From: j <j@mailb.org>
Date: Thu, 9 Jun 2016 12:50:34 +0200
Subject: [PATCH] use same folder structure in etc/systemd as used once
 installed

---
 ctl                                                 | 2 +-
 etc/systemd/{ => system}/pandora-cron.service       | 0
 etc/systemd/{ => system}/pandora-encoding.service   | 0
 etc/systemd/{ => system}/pandora-tasks.service      | 0
 etc/systemd/{ => system}/pandora-websocketd.service | 0
 etc/systemd/{ => system}/pandora.service            | 0
 update.py                                           | 4 ++--
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename etc/systemd/{ => system}/pandora-cron.service (100%)
 rename etc/systemd/{ => system}/pandora-encoding.service (100%)
 rename etc/systemd/{ => system}/pandora-tasks.service (100%)
 rename etc/systemd/{ => system}/pandora-websocketd.service (100%)
 rename etc/systemd/{ => system}/pandora.service (100%)

diff --git a/ctl b/ctl
index b37ae704..d16f0c63 100755
--- a/ctl
+++ b/ctl
@@ -46,7 +46,7 @@ if [ "$action" = "install" ]; then
                   /lib/systemd/system/pandora-encoding.service \
                   /lib/systemd/system/pandora-tasks.service \
                   /lib/systemd/system/pandora-websocketd.service
-            cp $BASE/etc/systemd/*.service /etc/systemd/system/
+            cp $BASE/etc/systemd/system/*.service /etc/systemd/system/
             cp $BASE/etc/tmpfiles.d/pandora.conf /etc/tmpfiles.d/
             systemd-tmpfiles --create /etc/tmpfiles.d/pandora.conf >/dev/null || true
             systemctl daemon-reload
diff --git a/etc/systemd/pandora-cron.service b/etc/systemd/system/pandora-cron.service
similarity index 100%
rename from etc/systemd/pandora-cron.service
rename to etc/systemd/system/pandora-cron.service
diff --git a/etc/systemd/pandora-encoding.service b/etc/systemd/system/pandora-encoding.service
similarity index 100%
rename from etc/systemd/pandora-encoding.service
rename to etc/systemd/system/pandora-encoding.service
diff --git a/etc/systemd/pandora-tasks.service b/etc/systemd/system/pandora-tasks.service
similarity index 100%
rename from etc/systemd/pandora-tasks.service
rename to etc/systemd/system/pandora-tasks.service
diff --git a/etc/systemd/pandora-websocketd.service b/etc/systemd/system/pandora-websocketd.service
similarity index 100%
rename from etc/systemd/pandora-websocketd.service
rename to etc/systemd/system/pandora-websocketd.service
diff --git a/etc/systemd/pandora.service b/etc/systemd/system/pandora.service
similarity index 100%
rename from etc/systemd/pandora.service
rename to etc/systemd/system/pandora.service
diff --git a/update.py b/update.py
index 4dec24b3..fad1c643 100755
--- a/update.py
+++ b/update.py
@@ -74,7 +74,7 @@ def check_services(base):
             if os.path.exists('/etc/init') and not os.path.exists('/bin/systemctl'):
                 print('\tsudo cp %s/etc/init/%s.conf /etc/init/' % (base, service))
             if os.path.exists('/bin/systemctl'):
-                print('\tsudo cp %s/etc/systemd/%s.service /lib/systemd/system/' % (base, service))
+                print('\tsudo cp %s/etc/systemd/system/%s.service /etc/systemd/system/' % (base, service))
                 print('\tsudo systemctl daemon-reload')
             print('\tsudo service %s start' % service)
             print('')
@@ -84,7 +84,7 @@ def update_service(service):
     if os.path.exists('/etc/init/%s.conf'%service):
         print('\tsudo cp %s/etc/init/%s.conf /etc/init/' % (base, service))
     if os.path.exists('/bin/systemctl'):
-        print('\tsudo cp %s/etc/systemd/%s.service /lib/systemd/system/' % (base, service))
+        print('\tsudo cp %s/etc/systemd/system/%s.service /etc/systemd/system/' % (base, service))
         print('\tsudo systemctl daemon-reload')
     print('\tsudo service %s restart' % service)