Merge pull request #252 from SyneRBI/env-path

expose SIRF_EXERCISES_WORKING_PATH

Author: casperdcl

lib/sirf_exercises/__init__.py

@@ -24,11 +24,9 @@ def exercises_data_path(*data_type):
     subdirectories like exercises_data_path('PET', 'mMR', 'NEMA_IQ').
     '''
     try:
-        # from installer?
         from .data_path import data_path
     except ImportError:
-        # from ENV variable?
-        data_path = os.environ.get('SIRF_EXERCISES_DATA_PATH')
+        data_path = os.getenv('SIRF_EXERCISES_DATA_PATH')
 
     if data_path is None or not os.path.exists(data_path):
         raise RuntimeError(
@@ -53,11 +51,11 @@ def exercises_working_path(*subfolders):
     '''
     try:
         from .working_path import working_dir
-        working_dir = os.path.join(working_dir, *subfolders)
     except ImportError:
-        working_dir = exercises_data_path('working_folder', *subfolders)
-    os.makedirs(working_dir, exist_ok=True)
-    return working_dir
+        working_dir = os.getenv('SIRF_EXERCISES_WORKING_PATH', exercises_data_path('working_folder'))
+    wkdir = os.path.join(working_dir, *subfolders)
+    os.makedirs(wkdir, exist_ok=True)
+    return wkdir
 
 
 def cd_to_working_dir(*subfolders):