From 6f7d708dae049cbaf4ac3ece4c7279e659bcc2b7 Mon Sep 17 00:00:00 2001 From: Brian Broll Date: Wed, 25 Jul 2018 13:03:36 -0500 Subject: [PATCH 1/2] Determine HOME correctly on windows. Fixes #1136 --- bin/deepforge | 9 +++++---- utils/extender.js | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/bin/deepforge b/bin/deepforge index b7375dccd..aa2466592 100755 --- a/bin/deepforge +++ b/bin/deepforge @@ -1,5 +1,6 @@ #!/usr/bin/env node +const HOME_DIR = require('os').homedir(); var Command = require('commander').Command, tcpPortUsed = require('tcp-port-used'), program = new Command(), @@ -16,7 +17,7 @@ var Command = require('commander').Command, merge = require('lodash.merge'), config, - configDir = path.join(process.env.HOME, '.deepforge'), + configDir = path.join(HOME_DIR, '.deepforge'), configPath = path.join(configDir, 'config.json'), dataPath = path.join(configDir, 'data'), @@ -24,7 +25,7 @@ var Command = require('commander').Command, rm_rf = require('rimraf'), p = dir => { if (typeof dir === 'string') { - return dir.replace(/^~/, process.env.HOME); // resolve '~' to '$HOME' + return dir.replace(/^~/, HOME_DIR); // resolve '~' to '$HOME' } return dir; }; @@ -152,7 +153,7 @@ var checkMongo = function(args, notSilent, mongoUri) { var startMongo = function(args, port, silent) { var opts = ['--dbpath', p(config.mongo.dir), '--port', port], - job = rawSpawn('mongod', opts, {cwd: process.env.HOME}); + job = rawSpawn('mongod', opts, {cwd: HOME_DIR}); if (!silent) { job.stdout.on('data', @@ -345,7 +346,7 @@ program if (value === null) { console.log(`Invalid config value: "${key}"`); return; - } + } if (typeof value === 'object') { value = JSON.stringify(value, null, 2); diff --git a/utils/extender.js b/utils/extender.js index f053d1ef4..b7239da73 100644 --- a/utils/extender.js +++ b/utils/extender.js @@ -11,7 +11,8 @@ const Q = require('q'); const rm_rf = require('rimraf'); const exists = require('exists-file'); const makeTpl = require('lodash.template'); -const CONFIG_DIR = path.join(process.env.HOME, '.deepforge'); +const HOME_DIR = require('os').homedir(); +const CONFIG_DIR = path.join(HOME_DIR, '.deepforge'); const EXT_CONFIG_NAME = 'deepforge-extension.json'; const EXTENSION_REGISTRY_NAME = 'extensions.json'; const extConfigPath = path.join(CONFIG_DIR, EXTENSION_REGISTRY_NAME); From 75f12fdf0072ffddb75a9b46059119e745a37ce0 Mon Sep 17 00:00:00 2001 From: Brian Broll Date: Wed, 25 Jul 2018 13:05:33 -0500 Subject: [PATCH 2/2] WIP #1136 fixed npm start cmd for windows --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 243e9846c..7f5e978b2 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "deepforge": "./bin/deepforge" }, "scripts": { - "start": "./bin/deepforge start", + "start": "node ./bin/deepforge start", "postinstall": "node utils/reinstall-extensions.js", "start-dev": "NODE_ENV=dev node app.js", "local": "node ./bin/start-local.js",