From 1b20493251b5ee08c995f7e09d6718dc92106d84 Mon Sep 17 00:00:00 2001
From: Nicola Peditto <npeditto@unime.it>
Date: Sat, 22 Sep 2018 10:43:10 +0200
Subject: [PATCH] Installation procedures updated

Change-Id: Ib8c1a2765be4724f18f631d4a761d9309f280579
---
 MANIFEST.in                               |  4 ++--
 scripts/{configure_lr.py => lr_configure} |  0
 scripts/{install_lr.py => lr_install}     |  2 ++
 setup.cfg                                 |  7 +++++++
 setup.py                                  | 16 ----------------
 5 files changed, 11 insertions(+), 18 deletions(-)
 rename scripts/{configure_lr.py => lr_configure} (100%)
 mode change 100644 => 100755
 rename scripts/{install_lr.py => lr_install} (99%)
 mode change 100644 => 100755

diff --git a/MANIFEST.in b/MANIFEST.in
index bb4613f..01e1d51 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,8 +4,8 @@ include templates/plugins.example.json
 include templates/services.example.json
 include etc/systemd/system/s4t-lightning-rod.service
 include etc/logrotate.d/lightning-rod.log
-include scripts/install_lr.py
-include scripts/configure_lr.py
+include scripts/lr_install
+include scripts/lr_configure
 
 include AUTHORS
 include ChangeLog
diff --git a/scripts/configure_lr.py b/scripts/lr_configure
old mode 100644
new mode 100755
similarity index 100%
rename from scripts/configure_lr.py
rename to scripts/lr_configure
diff --git a/scripts/install_lr.py b/scripts/lr_install
old mode 100644
new mode 100755
similarity index 99%
rename from scripts/install_lr.py
rename to scripts/lr_install
index e4c5432..dadd12b
--- a/scripts/install_lr.py
+++ b/scripts/lr_install
@@ -99,6 +99,8 @@ from subprocess import call
 call(["systemctl", "enable", "lightning-rod.service"])
 call(["systemctl", "daemon-reload"])
 
+"""
 os.system('cp ' + py_dist_pack + '/iotronic_lightningrod/scripts/'
           + 'configure_lr.py /usr/bin/configure_lr')
 os.chmod('/usr/bin/configure_lr', 0o744)
+"""
\ No newline at end of file
diff --git a/setup.cfg b/setup.cfg
index 5366f09..94d15d0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,6 +21,13 @@ classifier =
 [files]
 packages =
     iotronic_lightningrod
+data_files =
+    bin/ = scripts/*
+    /iotronic_lightningrod/templates = templates/*
+    /iotronic_lightningrod/etc/iotronic = etc/iotronic/iotronic.conf
+    /iotronic_lightningrod/etc/logrotate.d = etc/logrotate.d/lightning-rod.log
+    /iotronic_lightningrod/etc/systemd/system = etc/systemd/system/s4t-lightning-rod.service
+
 
 [build_sphinx]
 source-dir = doc/source
diff --git a/setup.py b/setup.py
index 75669b7..2a32244 100644
--- a/setup.py
+++ b/setup.py
@@ -28,20 +28,4 @@ setuptools.setup(
     setup_requires=['pbr>=1.8'],
     pbr=True,
     include_package_data=True,
-    data_files=[
-        ('/iotronic_lightningrod/etc/iotronic',
-         ['etc/iotronic/iotronic.conf']),
-        ('/iotronic_lightningrod/scripts', ['scripts/install_lr.py']),
-        ('/iotronic_lightningrod/scripts', ['scripts/configure_lr.py']),
-        ('/iotronic_lightningrod/templates',
-         ['templates/settings.example.json']),
-        ('/iotronic_lightningrod/templates',
-         ['templates/plugins.example.json']),
-        ('/iotronic_lightningrod/templates',
-         ['templates/services.example.json']),
-        ('/iotronic_lightningrod/etc/logrotate.d',
-         ['etc/logrotate.d/lightning-rod.log']),
-        ('/iotronic_lightningrod/etc/systemd/system/',
-         ['etc/systemd/system/s4t-lightning-rod.service']),
-    ],
 )