p3lib 1.1.96__tar.gz → 1.1.97__tar.gz

{p3lib-1.1.96 → p3lib-1.1.97}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.96
+Version: 1.1.97
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen

{p3lib-1.1.96 → p3lib-1.1.97}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = p3lib
-version = 1.1.96
+version = 1.1.97
 author = Paul Austen
 author_email = pausten.os@gmail.com
 description = A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.

{p3lib-1.1.96 → p3lib-1.1.97}/src/p3lib/boot_manager.py

@@ -275,25 +275,18 @@ class LinuxBootManager(object):
         if not os.path.isdir(exePath):
             self._fatalError("{} path not found".format(exePath))
 
-        # If the appName was set in the constructor then use this.
-        if self._appName:
-            appName = self._appName
-
-        # Else we use the initially executed python file.
-        else:
+        appName = os.path.basename(exeFile)
+        if len(appName) == 0:
+            self._fatalError("No app found to execute.")
 
-            appName = os.path.basename(exeFile)
-            if len(appName) == 0:
-                self._fatalError("No app found to execute.")
+        absApp = os.path.join(exePath, appName)
+        if not os.path.isfile( absApp ):
+            self._fatalError("{} file not found.".format(absApp) )
 
-            absApp = os.path.join(exePath, appName)
-            if not os.path.isfile( absApp ):
-                self._fatalError("{} file not found.".format(absApp) )
-
-            appName = appName.replace(".py", "")
-            if self._rootMode:
-                # We can only save to /var/log/ is we are root user.
-                self._logFile = os.path.join(LinuxBootManager.LOG_PATH, appName)
+        appName = appName.replace(".py", "")
+        if self._rootMode:
+            # We can only save to /var/log/ is we are root user.
+            self._logFile = os.path.join(LinuxBootManager.LOG_PATH, appName)
 
         return (appName, absApp)
 
@@ -322,7 +315,12 @@ class LinuxBootManager(object):
 
         appName, absApp = self._getApp()
 
-        serviceFile = self._getServiceFile(appName)
+        if self._appName:
+            serviceName = self._appName
+        else:
+            serviceName = appName
+
+        serviceFile = self._getServiceFile(serviceName)
 
         lines = []
         lines.append("[Unit]")

{p3lib-1.1.96 → p3lib-1.1.97}/src/p3lib.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: p3lib
-Version: 1.1.96
+Version: 1.1.97
 Summary: A group of python modules for networking, plotting data, config storage, automating boot scripts, ssh access and user input output.
 Home-page: https://github.com/pjaos/p3lib
 Author: Paul Austen