docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Accounting for settings.json

This commit is contained in:
Jeffrey Morgan 2015-06-09 20:49:26 -07:00
parent 47beaee0c8
commit 1552d09957
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@ -88,7 +88,7 @@ module.exports = function (grunt) {
files: [{ files: [{
expand: true, expand: true,
cwd: '.', cwd: '.',
src: ['package.json', 'index.html'], src: ['package.json', 'settings.json', 'index.html'],
dest: 'build/' dest: 'build/'
}, { }, {
expand: true, expand: true,
@ -111,7 +111,7 @@ module.exports = function (grunt) {
files: [{ files: [{
expand: true, expand: true,
cwd: 'resources', cwd: 'resources',
src: ['docker*', 'boot2docker.iso'], src: ['docker*'],
dest: 'dist/Kitematic-win32/resources/resources/' dest: 'dist/Kitematic-win32/resources/resources/'
}], }],
options: { options: {

2
src/browser.js
View File

@ -14,7 +14,7 @@ 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[(process.platform === 'win32') ? 'USERPROFILE' : 'HOME'], 'Library', 'Application\ Support', 'Kitematic', 'size')));
} catch (err) {} } catch (err) {}
try { 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) {} } catch (err) {}
var handleStartupEvent = function() { var handleStartupEvent = function() {

2
src/utils/MetricsUtil.js
View File

@ -7,7 +7,7 @@ var util = require('./Util');
var settings; var settings;
try { 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) { } catch (err) {
settings = {}; settings = {};
} }

2
src/utils/Util.js
View File

@ -61,7 +61,7 @@ module.exports = {
settingsjson: function () { settingsjson: function () {
var settingsjson = {}; var settingsjson = {};
try { 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) {} } catch (err) {}
return settingsjson; return settingsjson;
}, },