diff --git a/scripts/exports.py b/scripts/exports.py index bd5fccd..c1c24ca 100644 --- a/scripts/exports.py +++ b/scripts/exports.py @@ -83,9 +83,9 @@ def make_parts(target, part_type, parts = None): # # Find all the scad files # - lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed' + lib_dirs = [path + '/' + lib + '/printed' for path in os.environ['OPENSCADPATH'].split(os.pathsep) for lib in sorted(os.listdir(path))] module_suffix = '_dxf' if part_type == 'svg' else '_' + part_type - for dir in [source_dir, source_dir + '/printed', lib_dir]: + for dir in [source_dir, source_dir + '/printed'] + lib_dirs: if os.path.isdir(dir): for filename in os.listdir(dir): if filename[-5:] == ".scad": diff --git a/scripts/views.py b/scripts/views.py index 81f1104..4d9804b 100755 --- a/scripts/views.py +++ b/scripts/views.py @@ -124,8 +124,8 @@ def views(target, do_assemblies = None): # Find all the scad files # main_blurb = None - lib_dir = os.environ['OPENSCADPATH'] + '/NopSCADlib/printed' - for dir in [source_dir, source_dir + '/printed', lib_dir]: + lib_dirs = [path + '/' + lib + '/printed' for path in os.environ['OPENSCADPATH'].split(os.pathsep) for lib in sorted(os.listdir(path))] + for dir in [source_dir, source_dir + '/printed'] + lib_dirs: if os.path.isdir(dir): for filename in os.listdir(dir): if filename.endswith('.scad'):