diff --git a/install.py b/install.py index 76da228..592b6d9 100755 --- a/install.py +++ b/install.py @@ -12,21 +12,12 @@ os.chdir(base) for root, folders, files in os.walk(join(base, 'static')): for f in files: src = join(root, f) - if 'ontology/' in src: - continue target = src.replace(base, '/srv/pandora') rel_src = os.path.relpath(src, dirname(target)) if os.path.exists(target): os.unlink(target) os.symlink(rel_src, target) -src = join(base, 'static', 'ontology') -target = src.replace(base, '/srv/pandora') -rel_src = os.path.relpath(src, dirname(target)) -if os.path.exists(target): - os.unlink(target) -os.symlink(rel_src, target) - os.chdir(base) src = join(base, 'config.jsonc') target = '/srv/pandora/pandora/config.%s.jsonc' % name diff --git a/ontology/update.py b/ontology/update.py index c4dfb43..de51c31 100755 --- a/ontology/update.py +++ b/ontology/update.py @@ -22,12 +22,10 @@ def find_path(parent, root=None, path=None): return r def get_node(name, children, parent=None): - children_ = [get_node(child, children[child], name) for child in children] - children_.sort(key=lambda c: c['name']) node = { "size": len(children) + 100, "name": name, - "children": children_ + "children": [get_node(child, children[child], name) for child in children] } if not node['children']: del node['children']