mirror of
https://github.com/caelestia-dots/cli.git
synced 2026-06-18 15:00:00 -05:00
fix: remove duplicate resolve component
This commit is contained in:
@@ -107,10 +107,14 @@ class Command:
|
|||||||
disable = _parse_list_arg(self.args.disable_components)
|
disable = _parse_list_arg(self.args.disable_components)
|
||||||
try:
|
try:
|
||||||
manifest = source.manifest_at(tip)
|
manifest = source.manifest_at(tip)
|
||||||
manifest.resolve_components(enable=enable, disable=disable)
|
|
||||||
|
|
||||||
|
# No flags given, prompt user for non-default components
|
||||||
if enable is None and disable is None:
|
if enable is None and disable is None:
|
||||||
self.prompt_optional_components(manifest)
|
optional = [name for name, comp in manifest.components.items() if not comp.default]
|
||||||
|
if optional:
|
||||||
|
enable = prompt_selection(optional, "Components to enable?")
|
||||||
|
|
||||||
|
manifest.resolve_components(enable=enable, disable=disable)
|
||||||
except (SourceError, ManifestError, ComponentError) as e:
|
except (SourceError, ManifestError, ComponentError) as e:
|
||||||
fatal(e)
|
fatal(e)
|
||||||
|
|
||||||
@@ -119,15 +123,6 @@ class Command:
|
|||||||
|
|
||||||
return source, tip, manifest
|
return source, tip, manifest
|
||||||
|
|
||||||
def prompt_optional_components(self, manifest: Manifest) -> None:
|
|
||||||
comp_arr = manifest.disabled_components
|
|
||||||
if not comp_arr:
|
|
||||||
return
|
|
||||||
|
|
||||||
selected = prompt_selection(comp_arr, "Components to enable?")
|
|
||||||
if selected:
|
|
||||||
manifest.resolve_components(enable=selected)
|
|
||||||
|
|
||||||
def deploy_configs(self, source: DotsSource, manifest: Manifest) -> dict[str, str]:
|
def deploy_configs(self, source: DotsSource, manifest: Manifest) -> dict[str, str]:
|
||||||
print()
|
print()
|
||||||
log("Installing configs...")
|
log("Installing configs...")
|
||||||
|
|||||||
Reference in New Issue
Block a user