hack closes
@@ -347,6 +347,9 @@ class MenuHelper:
else:
matches = p_helper.available_tools(path, version=version)
for match in matches:
+ if core:
+ all_tools['normal'].append(match[0].split('/')[-1].replace('_', '-'))
+ else:
all_tools['normal'].append(match[0].split('/')[-1])
# get tools that have been installed
@@ -355,7 +358,7 @@ class MenuHelper:
if repo[0] and repo[1] in repos:
name = template.option(tool, "name")
if name[0]:
- all_tools['installed'].append(name[1])
+ all_tools['installed'].append(name[1].replace('_', '-'))
# get core tools that have been built and/or are running
try:
@@ -373,6 +376,9 @@ class MenuHelper:
if image_check:
if ('vent.name' in image.attrs['Labels'] and
'hidden' not in image.attrs['Labels']['vent.groups']):
+ if core:
+ all_tools['built'].append(image.attrs['Labels']['vent.name'].replace('_', '-'))
+ else:
all_tools['built'].append(image.attrs['Labels']['vent.name'])
except Exception as err: # pragma: no cover
pass
@@ -389,6 +395,9 @@ class MenuHelper:
if container_check:
if ('vent.name' in container.attrs['Config']['Labels'] and
'hidden' not in image.attrs['Labels']['vent.groups']):
+ if core:
+ all_tools['running'].append(container.attrs['Config']['Labels']['vent.name'].replace('_', '-'))
+ else:
all_tools['running'].append(container.attrs['Config']['Labels']['vent.name'])
except Exception as err: # pragma: no cover
pass
