diff --git a/Gruntfile.js b/Gruntfile.js index bcce7e9b86..8f829617f2 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -88,7 +88,7 @@ module.exports = function (grunt) { files: [{ expand: true, cwd: '.', - src: ['package.json', 'index.html'], + src: ['package.json', 'settings.json', 'index.html'], dest: 'build/' }, { expand: true, @@ -111,7 +111,7 @@ module.exports = function (grunt) { files: [{ expand: true, cwd: 'resources', - src: ['docker*', 'boot2docker.iso'], + src: ['docker*'], dest: 'dist/Kitematic-win32/resources/resources/' }], options: { diff --git a/src/browser.js b/src/browser.js index 5a4f8c844f..cb8010dd1f 100644 --- a/src/browser.js +++ b/src/browser.js @@ -14,7 +14,7 @@ try { size = JSON.parse(fs.readFileSync(path.join(process.env[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], 'Library', 'Application\ Support', 'Kitematic', 'size'))); } catch (err) {} try { - settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'settings.json'), 'utf8')); + settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, 'settings.json'), 'utf8')); } catch (err) {} var handleStartupEvent = function() { diff --git a/src/utils/MetricsUtil.js b/src/utils/MetricsUtil.js index e7083989fd..8b19edfbd0 100644 --- a/src/utils/MetricsUtil.js +++ b/src/utils/MetricsUtil.js @@ -7,7 +7,7 @@ var util = require('./Util'); var settings; try { - settings = JSON.parse(fs.readFileSync(path.join(__dirname, '../..', 'settings.json'), 'utf8')); + settings = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'settings.json'), 'utf8')); } catch (err) { settings = {}; } diff --git a/src/utils/Util.js b/src/utils/Util.js index c8609e95c9..0430d3de71 100644 --- a/src/utils/Util.js +++ b/src/utils/Util.js @@ -61,7 +61,7 @@ module.exports = { settingsjson: function () { var settingsjson = {}; try { - settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../..', 'settings.json'), 'utf8')); + settingsjson = JSON.parse(fs.readFileSync(path.join(__dirname, '..', 'settings.json'), 'utf8')); } catch (err) {} return settingsjson; },