🎨 various fixes for ghost install local

TryGhost · Nov 8, 2016 · a716d84 · a716d84
1 parent 1b49eaa
commit a716d84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/lib/commands/run.js b/lib/commands/run.js
@@ -20,12 +20,14 @@ module.exports.Command = BaseCommand.extend({
             'production' : 'development';
 
         var KnexMigrator = require('knex-migrator'),
-            merge = require('lodash/merge'),
             spawn = require('child_process').spawn,
             path = require('path'),
             self = this,
             knexMigrator;
 
+        // knex-migrator needs to know the content path
+        process.env.paths__contentPath = path.join(process.cwd(), 'content');
+
         knexMigrator = new KnexMigrator({
             knexMigratorFilePath: path.join(process.cwd(), 'current')
         });
@@ -42,10 +44,7 @@ module.exports.Command = BaseCommand.extend({
             }).then(function () {
                 self.child = spawn(process.execPath, ['current/index.js'], {
                     cwd: process.cwd(),
-                    stdio: [0, 1, 2, 'ipc'],
-                    env: merge({
-                        paths__contentPath: path.join(process.cwd(), 'content')
-                    }, process.env)
+                    stdio: [0, 1, 2, 'ipc']
                 });
 
                 self.child.on('error', function (error) {
@@ -54,7 +53,6 @@ module.exports.Command = BaseCommand.extend({
                 });
 
                 self.child.on('message', function (message) {
-                    console.log(message);
                     if (message.started) {
                         self.sendMessage(message);
                         return;

diff --git a/lib/commands/setup.js b/lib/commands/setup.js
@@ -18,15 +18,20 @@ module.exports.Command = BaseCommand.extend({
         this.checkValidInstall();
 
         var local = options.local || false,
-            self = this,
             Promise = require('bluebird'),
-            config;
+            path = require('path'),
+            self = this;
 
         delete options.local;
 
-        config = (local) ? Promise.resolve() : this.runCommand('config', null, null, options);
+        if (local) {
+            options.url = 'http://localhost:2368/',
+            options.db = 'sqlite3',
+            options.dbpath = path.join(process.cwd(), 'content/data/ghost-local.db');
+            options.environment = 'development';
+        }
 
-        return config.then(function afterConfig() {
+        return this.runCommand('config', null, null, options).then(function afterConfig() {
             // If 'local' is specified we will automatically start ghost
             if (local) {
                 return Promise.resolve({start: true});

diff --git a/lib/commands/start.js b/lib/commands/start.js
@@ -40,7 +40,6 @@ module.exports.Command = BaseCommand.extend({
 
         pm = resolveProcessManager(config);
 
-        // TODO: rethink this
         return self.ui.run(
             Promise.resolve(pm.start(process.cwd(), environment)),
             'Starting Ghost instance'