diff --git a/launch.py b/launch.py index b8d0bfc53..3099bba33 100755 --- a/launch.py +++ b/launch.py @@ -292,6 +292,11 @@ def main(): else: log.warning(f'Setup complete with errors: {installer.errors}') log.warning(f'See log file for more details: {installer.log_file}') + if args.enso and not args.skip_git: + from modules import enso + enso.install() + if args.upgrade: + enso.update() installer.extensions_preload(parser) # adds additional args from extensions args = installer.parse_args(parser) log.info(f'Installer time: {init_summary()}') diff --git a/modules/enso.py b/modules/enso.py index 8cfd44e27..1f6063659 100644 --- a/modules/enso.py +++ b/modules/enso.py @@ -1,16 +1,18 @@ import os from installer import log, git +from modules.paths import extensions_dir ENSO_REPO = "https://github.com/CalamitousFelicitousness/enso.git" -ENSO_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "extensions-builtin", "enso") +# ENSO_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.abspath(__file__))), "extensions-builtin", "enso") +ENSO_DIR = os.path.join(extensions_dir, "enso") def install(): """Clone the Enso frontend repo if not already present.""" if os.path.isdir(ENSO_DIR): return - log.info(f'Enso: installing to "{ENSO_DIR}"') + log.info(f'Enso: folder="{ENSO_DIR}" installing') git(f'clone "{ENSO_REPO}" "{ENSO_DIR}"') @@ -18,5 +20,5 @@ def update(): """Pull latest changes for the Enso frontend repo.""" if not os.path.isdir(ENSO_DIR): return - log.info('Enso: updating') + log.info(f'Enso: folder="{ENSO_DIR}" updating') git('pull', folder=ENSO_DIR)