From 3585bd7039a90b01cdd1d833fe0b4ecde307ef5b Mon Sep 17 00:00:00 2001
From: NaruX <akira@narux.de>
Date: Tue, 30 May 2017 11:46:40 +0200
Subject: [PATCH] =?UTF-8?q?add:=20Pr=C3=BCfung=20f=C3=BCr=20config.rsc=20P?=
 =?UTF-8?q?fad=20add:=20Pr=C3=BCfung=20piControlReset=20oder=20piTest=20-x?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 revpipyload.e4p            |  4 ++--
 revpipyload/revpipyload.py | 25 +++++++++++++++++++++++--
 setup.py                   |  2 +-
 3 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/revpipyload.e4p b/revpipyload.e4p
index e78a34c..716912e 100644
--- a/revpipyload.e4p
+++ b/revpipyload.e4p
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Project SYSTEM "Project-5.1.dtd">
 <!-- eric project file for project revpipyload -->
-<!-- Saved: 2017-04-11, 12:21:18 -->
+<!-- Saved: 2017-05-30, 11:45:26 -->
 <!-- Copyright (C) 2017 Sven Sager, akira@narux.de -->
 <Project version="5.1">
   <Language>en_US</Language>
@@ -9,7 +9,7 @@
   <ProgLanguage mixed="0">Python3</ProgLanguage>
   <ProjectType>Console</ProjectType>
   <Description>Dieser Loader wird über das Init-System geladen und führt das angegebene Pythonprogramm aus. Es ist für den RevolutionPi gedacht um automatisch das SPS-Programm zu starten.</Description>
-  <Version>0.2.12</Version>
+  <Version>0.3.0</Version>
   <Author>Sven Sager</Author>
   <Email>akira@narux.de</Email>
   <Eol index="-1"/>
diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py
index 78034c9..a639f46 100755
--- a/revpipyload/revpipyload.py
+++ b/revpipyload/revpipyload.py
@@ -51,10 +51,10 @@ from time import sleep, asctime
 from xmlrpc.client import Binary
 from xmlrpc.server import SimpleXMLRPCServer
 
-configrsc = "/opt/KUNBUS/config.rsc"
+configrsc = None
 picontrolreset = "/opt/KUNBUS/piControlReset"
 procimg = "/dev/piControl0"
-pyloadverion = "0.2.12"
+pyloadverion = "0.3.0"
 
 
 class LogReader():
@@ -483,6 +483,27 @@ class RevPiPyLoad():
         """Instantiiert RevPiPyLoad-Klasse."""
         proginit.configure()
 
+        # Globale Werte anpassen
+        global configrsc
+        global picontrolreset
+
+        # piCtory Konfiguration an bekannten Stellen prüfen
+        lst_rsc = ["/etc/revpi/config.rsc", "/opt/KUNBUS/config.rsc"]
+        for rscfile in lst_rsc:
+            if os.access(rscfile, os.F_OK | os.R_OK):
+                configrsc = rscfile
+                break
+        if configrsc is None:
+            raise RuntimeError(
+                "can not access known pictory configurations at {}"
+                "".format(", ".join(lst_rsc))
+            )
+
+        # piControlReset suchen
+        if not os.access(picontrolreset, os.F_OK | os.X_OK):
+            picontrolreset = "/usr/bin/piTest -x"
+
+        # Klassenattribute
         self._exit = True
         self.evt_loadconfig = Event()
         self.globalconfig = ConfigParser()
diff --git a/setup.py b/setup.py
index d0fa2cb..ae17d66 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(
 
     license="LGPLv3",
     name="revpipyload",
-    version="0.2.12",
+    version="0.3.0",
 
     scripts=["data/revpipyload"],