🐛 pass environment to process manager and set contentPath on start

TryGhost · Sep 20, 2016 · 1bd6016 · 1bd6016
1 parent fcc1229
commit 1bd6016
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/lib/commands/start.js b/lib/commands/start.js
@@ -26,11 +26,12 @@ module.exports = BaseCommand.extend({
         var resolveProcessManager = require('../process').resolve,
             Config = require('../utils/config'),
             Promise = require('bluebird'),
-            env = {},
+            path = require('path'),
+            self = this,
             environment, config, pm, cliConfig;
 
         options = options || {};
-        env.NODE_ENV = environment = (options.production || !options.development) ? 'production' : 'development';
+        environment = (options.production || !options.development) ? 'production' : 'development';
 
         config = new Config('config.' + environment + '.json');
         cliConfig = new Config('.ghost-cli');
@@ -41,11 +42,15 @@ module.exports = BaseCommand.extend({
 
         pm = resolveProcessManager(config);
 
-        return this.ui.run(
-            Promise.resolve(pm.start(process.cwd())),
-            'Starting Ghost instance'
-        ).then(function () {
-            cliConfig.set('running', environment).save();
-        });
+        // TODO: rethink this
+        return this.runCommand('config', 'paths.contentPath', path.join(process.cwd(), 'content'), {})
+            .then(function () {
+                return self.ui.run(
+                    Promise.resolve(pm.start(process.cwd(), environment)),
+                    'Starting Ghost instance'
+                );
+            }).then(function () {
+                cliConfig.set('running', environment).save();
+            });
     }
 });
diff --git a/lib/process/local.js b/lib/process/local.js
@@ -6,16 +6,18 @@ PID_FILE = '.ghostpid';
 module.exports = BaseProcess.extend({
     name: 'local',
 
-    start: function start(cwd) {
+    start: function start(cwd, environment) {
         var fs = require('fs'),
             path = require('path'),
+            assign = require('lodash/assign'),
             spawn = require('child_process').spawn,
             cp;
 
         cp = spawn('node', ['current/index.js'], {
             cwd: cwd,
             detached: true,
-            stdio: 'ignore'
+            stdio: 'ignore',
+            env: assign({NODE_ENV: environment}, process.env)
         });
 
         fs.writeFileSync(path.join(cwd, PID_FILE), cp.pid);