Updated self.appdir code to try one or two methods of finding working folder, with .realpath in each case.

Author: Developer

BlocklyPropClient.py

@@ -65,9 +65,10 @@ def __init__(self, *args, **kwargs):
         self.connected = False
 
         # Path to where application was launched
-	# self.appdir = os.path.dirname(sys.argv[0])
-	# self.appdir = os.getcwd()   #works
+        # realpath expands to full path if __file__ or sys.argv[0] contains just a filename
 	self.appdir = os.path.dirname(os.path.realpath(__file__))
+        if self.appdir == "":
+            self.appdir = os.path.dirname(os.path.realpath(sys.argv[0]))
 	self.logger.info('Logging is enabled')
 	self.logger.info('Application launched from %s', self.appdir)
 

BlocklyServer.py

@@ -27,8 +27,10 @@ def __init__(self, version, queue):
 
         self.version = version
         self.queue = queue
-	# self.appdir = os.path.dirname(sys.argv[0])
+        # realpath expands to full path if __file__ or sys.argv[0] contains just a filename
 	self.appdir = os.path.dirname(os.path.realpath(__file__))
+        if self.appdir == "":
+            self.appdir = os.path.dirname(os.path.realpath(sys.argv[0]))
         self.logger.debug("Application started from: %s", self.appdir)
 
         queue.put((10, 'INFO', 'Server started'))

PropellerLoad.py

@@ -19,14 +19,12 @@ def __init__(self):
         self.logger.info('Creating loader logger.')
 
         # Find the path to the application launch directory
-	# self.appdir = os.path.dirname(sys.argv[0])
-	# self.appdir = os.getcwd()   # works
+        # realpath expands to full path if __file__ or sys.argv[0] contains just a filename
 	self.appdir = os.path.dirname(os.path.realpath(__file__))
+        if self.appdir == "":
+            self.appdir = os.path.dirname(os.path.realpath(sys.argv[0]))
         self.logger.debug("Application running from: %s", self.appdir)
 
-#        if not self.appdir:
-#            self.appdir = os.getcwd()
-
         self.propeller_load_executables = {
             "Windows":  "/propeller-tools/windows/propeller-load.exe",
             "Linux":    "/propeller-tools/linux/propeller-load",
@@ -73,9 +71,11 @@ def load(self, action, file_to_load, com_port):
         self.loading = True
 
         # Patch until we figure out why the __init__ is not getting called
-        if not self.appdir or self.appdir == '':
-	    # self.appdir = os.path.dirname(sys.argv[0])
+	if not self.appdir or self.appdir == '':
+	    # realpath expands to full path if __file__ or sys.argv[0] contains just a filename
 	    self.appdir = os.path.dirname(os.path.realpath(__file__))
+            if self.appdir == "":
+                self.appdir = os.path.dirname(os.path.realpath(sys.argv[0]))
 
         executable = self.appdir + self.propeller_load_executables[platform.system()]
         self.logger.debug('Loader executable path is: %s)', executable)