From 7a5ea6817ece10b3e611235e70cf5177016d6231 Mon Sep 17 00:00:00 2001
From: Thomas Oettli <spacefreak@noop.ch>
Date: Thu, 5 Nov 2020 02:00:27 +0100
Subject: [PATCH] fix packaging and installation/uninstallation

---
 MANIFEST.in                                  | 4 ++--
 pyinotifyd/_install.py                       | 8 ++++----
 {docs => pyinotifyd/docs}/config.py.example  | 0
 {misc => pyinotifyd/misc}/pyinotifyd.service | 0
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename {docs => pyinotifyd/docs}/config.py.example (100%)
 rename {misc => pyinotifyd/misc}/pyinotifyd.service (100%)

diff --git a/MANIFEST.in b/MANIFEST.in
index ca4758c..84821af 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,3 @@
 include LICENSE README.md
-recursive-include docs *
-recursive-include misc *
+recursive-include pyinotifyd/docs *
+recursive-include pyinotifyd/misc *
diff --git a/pyinotifyd/_install.py b/pyinotifyd/_install.py
index 2d0c78d..0a6ff94 100755
--- a/pyinotifyd/_install.py
+++ b/pyinotifyd/_install.py
@@ -19,7 +19,7 @@ import os
 import shutil
 import sys
 
-SYSTEMD_PATH = "/usr/lib/systemd/system"
+SYSTEMD_PATH = "/lib/systemd/system"
 
 
 def _check_root():
@@ -77,9 +77,9 @@ def install(name):
             logging.error(f"unable to copy config file to {dst}: {e}")
             sys.exit(4)
         else:
-            logging.info("example config file copied to {dst}")
+            logging.info(f"example config file copied to {dst}")
 
-    logging.info("{name} successfully installed")
+    logging.info(f"{name} successfully installed")
 
 
 def uninstall(name):
@@ -105,4 +105,4 @@ def uninstall(name):
         logging.warning(
             f"config dir {config_dir} still exists, please delete manually")
 
-    logging.info("{name} successfully uninstalled")
+    logging.info(f"{name} successfully uninstalled")
diff --git a/docs/config.py.example b/pyinotifyd/docs/config.py.example
similarity index 100%
rename from docs/config.py.example
rename to pyinotifyd/docs/config.py.example
diff --git a/misc/pyinotifyd.service b/pyinotifyd/misc/pyinotifyd.service
similarity index 100%
rename from misc/pyinotifyd.service
rename to pyinotifyd/misc/pyinotifyd.service