Merge pull request #1408 from kelemen/master

Fix for #1403
This commit is contained in:
Jeffrey Morgan 2016-02-01 20:24:34 -08:00
commit 1d52da8705
1 changed files with 6 additions and 2 deletions

View File

@ -8,13 +8,17 @@ import os from 'os';
import path from 'path';
import child_process from 'child_process';
var isWin = process.platform === 'win32';
process.env.NODE_PATH = path.join(__dirname, 'node_modules');
process.env.RESOURCES_PATH = path.join(__dirname, '/../resources');
process.env.PATH = '/usr/local/bin:' + process.env.PATH;
if (!isWin) {
process.env.PATH = '/usr/local/bin:' + process.env.PATH;
}
var size = {}, settingsjson = {};
try {
size = JSON.parse(fs.readFileSync(path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], 'Library', 'Application\ Support', 'Kitematic', 'size')));
size = JSON.parse(fs.readFileSync(path.join(process.env[isWin ? 'USERPROFILE' : 'HOME'], 'Library', 'Application\ Support', 'Kitematic', 'size')));
} catch (err) {}
try {
settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, 'settings.json'), 'utf8'));