diff --git a/package.json b/package.json index 6536e0e8bf..8d9dca4a81 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "test": "jest -c jest-unit.json", "integration": "jest -c jest-integration.json", "release": "grunt release", - "release-mac": "grunt release-mac", "lint": "jsxhint src" }, "license": "Apache-2.0", diff --git a/src/browser.js b/src/browser.js index 8795c2ddc9..4b2e83af83 100644 --- a/src/browser.js +++ b/src/browser.js @@ -8,18 +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'); -if (!isWin) { +if (process.platform !== 'win32') { process.env.PATH = '/usr/local/bin:' + process.env.PATH; } var size = {}, settingsjson = {}; try { - size = JSON.parse(fs.readFileSync(path.join(process.env[isWin ? 'USERPROFILE' : 'HOME'], 'Library', 'Application\ Support', 'Kitematic', 'size'))); + size = JSON.parse(fs.readFileSync(path.join(app.getPath('userData'), 'size'))); } catch (err) {} + try { settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, 'settings.json'), 'utf8')); } catch (err) {} diff --git a/src/utils/Util.js b/src/utils/Util.js index 874b429ea6..590e9c2791 100644 --- a/src/utils/Util.js +++ b/src/utils/Util.js @@ -62,9 +62,6 @@ module.exports = { // TODO: fix me for windows 7 return 'Documents'; }, - supportDir: function () { - return app.getPath('userData'); - }, CommandOrCtrl: function () { return this.isWindows() ? 'Ctrl' : 'Command'; }, diff --git a/src/utils/WebUtil.js b/src/utils/WebUtil.js index 2d774fe013..f726d57ca1 100644 --- a/src/utils/WebUtil.js +++ b/src/utils/WebUtil.js @@ -10,7 +10,7 @@ import metrics from './MetricsUtil'; var WebUtil = { addWindowSizeSaving: function () { window.addEventListener('resize', function () { - fs.writeFileSync(path.join(util.supportDir(), 'size'), JSON.stringify({ + fs.writeFileSync(path.join(app.getPath('userData'), 'size'), JSON.stringify({ width: window.outerWidth, height: window.outerHeight }));