From d1507e2c9ecd40ecf4ac3bc38c801481282f04bb Mon Sep 17 00:00:00 2001 From: Jim Ehrismann Date: Mon, 26 Oct 2020 18:48:56 -0400 Subject: [PATCH] got extensions to load when checking multiple folders Signed-off-by: Jim Ehrismann --- src/extensions/extension-manager.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/extensions/extension-manager.ts b/src/extensions/extension-manager.ts index b11666cbe5..0d16b8cc91 100644 --- a/src/extensions/extension-manager.ts +++ b/src/extensions/extension-manager.ts @@ -84,9 +84,10 @@ export class ExtensionManager { } async loadFromFolder(folderPaths: string[]): Promise { - const extensions: InstalledExtension[] = [] + let allExtensions: InstalledExtension[] = [] const bundledExtensions = getBundledExtensions() - folderPaths.forEach(async folderPath => { + for (let folderPath of folderPaths) { + const extensions: InstalledExtension[] = [] const paths = await fs.readdir(folderPath); for (const fileName of paths) { if (!bundledExtensions.includes(fileName)) { @@ -100,12 +101,14 @@ export class ExtensionManager { extensions.push(ext) } } - await fs.writeFile(path.join(this.extensionPackagesRoot, "package.json"), JSON.stringify(this.packagesJson), {mode: 0o600}) - await this.installPackages() logger.debug(`[EXTENSION-MANAGER]: ${extensions.length} extensions loaded`, { folderPath, extensions }); - }) - return extensions; + allExtensions = allExtensions.concat(extensions) + } + await fs.writeFile(path.join(this.extensionPackagesRoot, "package.json"), JSON.stringify(this.packagesJson), {mode: 0o600}) + await this.installPackages() + + return allExtensions; } }