From 77960f1d425c1d708251c7c1afb3ea09e7bbe812 Mon Sep 17 00:00:00 2001 From: David Wilson Date: Fri, 13 Jul 2018 14:32:07 -0700 Subject: [PATCH] Enable repo-local core packages in the 'packages' folder --- src/main-process/atom-protocol-handler.js | 3 +++ src/package-manager.js | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main-process/atom-protocol-handler.js b/src/main-process/atom-protocol-handler.js index 1affba02a..50f16b459 100644 --- a/src/main-process/atom-protocol-handler.js +++ b/src/main-process/atom-protocol-handler.js @@ -20,6 +20,9 @@ class AtomProtocolHandler { if (!safeMode) { this.loadPaths.push(path.join(process.env.ATOM_HOME, 'dev', 'packages')) + if (process.env.ATOM_DEV_RESOURCE_PATH) { + this.loadPaths.push(path.join(process.env.ATOM_DEV_RESOURCE_PATH, 'packages')) + } } this.loadPaths.push(path.join(process.env.ATOM_HOME, 'packages')) diff --git a/src/package-manager.js b/src/package-manager.js index 17a5f2214..ece7dd017 100644 --- a/src/package-manager.js +++ b/src/package-manager.js @@ -61,6 +61,9 @@ module.exports = class PackageManager { if (params.configDirPath != null && !params.safeMode) { if (this.devMode) { this.packageDirPaths.push(path.join(params.configDirPath, 'dev', 'packages')) + if (process.env.ATOM_DEV_RESOURCE_PATH) { + this.packageDirPaths.push(path.join(process.env.ATOM_DEV_RESOURCE_PATH, 'packages')) + } } this.packageDirPaths.push(path.join(params.configDirPath, 'packages')) }