From 5ce778c6dec57738e503a16ef48d495f92bef85b Mon Sep 17 00:00:00 2001
From: sezanzeb <proxima@hip70890b.de>
Date: Thu, 15 Apr 2021 21:16:07 +0200
Subject: [PATCH] #82 gitignored commit_hash, /lib/udev

---
 .gitignore          |  2 ++
 keymapper/logger.py |  7 +++++--
 setup.py            | 14 +++-----------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 19429107..c4e3d25a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+keymapper/commit_hash.py
+
 *.glade~
 *.glade#
 .idea
diff --git a/keymapper/logger.py b/keymapper/logger.py
index a908c7e0..34bb6112 100644
--- a/keymapper/logger.py
+++ b/keymapper/logger.py
@@ -30,6 +30,11 @@ import pkg_resources
 
 from keymapper.user import HOME
 
+try:
+    from keymapper.commit_hash import COMMIT_HASH
+except ImportError:
+    COMMIT_HASH = ''
+
 
 SPAM = 5
 
@@ -37,8 +42,6 @@ start = time.time()
 
 previous_key_spam = None
 
-COMMIT_HASH = '12ff3df22e47a2e8b7be2811b300512c2d597725'  # overwritten in setup.py
-
 
 def spam(self, message, *args, **kwargs):
     """Log a more-verbose message than debug."""
diff --git a/setup.py b/setup.py
index a8d1e596..5419ad54 100644
--- a/setup.py
+++ b/setup.py
@@ -31,16 +31,8 @@ class Install(install):
     def run(self):
         commit = os.popen('git rev-parse HEAD').read().strip()
         if re.match(r'^([a-z]|[0-9])+$', commit):
-            with open('keymapper/logger.py', 'r') as f:
-                contents = f.read()
-                contents = re.sub(
-                    r"COMMIT_HASH = '.*?'",
-                    f"COMMIT_HASH = '{commit}'",
-                    contents
-                )
-
-            with open('keymapper/logger.py', 'w') as f:
-                f.write(contents)
+            with open('keymapper/commit_hash.py', 'w') as f:
+                f.write(f"COMMIT_HASH = '{commit}'\n")
 
         install.run(self)
 
@@ -80,7 +72,7 @@ setup(
         ('/usr/lib/systemd/system', ['data/key-mapper.service']),
         ('/etc/dbus-1/system.d/', ['data/keymapper.Control.conf']),
         ('/etc/xdg/autostart/', ['data/key-mapper-autoload.desktop']),
-        ('/etc/udev/rules.d', ['data/key-mapper.rules']),
+        ('/lib/udev/rules.d', ['data/key-mapper.rules']),
         ('/usr/bin/', ['bin/key-mapper-gtk']),
         ('/usr/bin/', ['bin/key-mapper-service']),
         ('/usr/bin/', ['bin/key-mapper-control']),