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

Merge branch 'master' of github.com:kitematic/kitematic 

Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
This commit is contained in:
Jeffrey Morgan 2015-04-17 09:59:58 -04:00
parent 531a10a66b 477f2d7539
commit 0c411c318d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gulpfile.js
View File

@ -17,7 +17,7 @@ var shell = require('gulp-shell');
var sourcemaps = require('gulp-sourcemaps');
var dependencies = Object.keys(packagejson.dependencies);
var isBeta = process.argv.indexOf('--beta') !== -1;
var argv = require('minimist')(process.argv.slice(2));
var settings;
try {
@ -25,15 +25,15 @@ try {
} catch (err) {
settings = {};
}
settings.beta = isBeta;
settings.beta = argv.beta;
var options = {
dev: process.argv.indexOf('release') === -1,
beta: isBeta,
appFilename: isBeta ? 'Kitematic (Beta).app' : 'Kitematic.app',
appName: isBeta ? 'Kitematic (Beta)' : 'Kitematic',
beta: argv.beta,
appFilename: argv.beta ? 'Kitematic (Beta).app' : 'Kitematic.app',
appName: argv.beta ? 'Kitematic (Beta)' : 'Kitematic',
name: 'Kitematic',
icon: isBeta ? './util/kitematic-beta.icns' : './util/kitematic.icns',
icon: argv.beta ? './util/kitematic-beta.icns' : './util/kitematic.icns',
bundle: 'com.kitematic.kitematic'
};
@ -63,7 +63,6 @@ gulp.task('styles', function () {
return gulp.src('styles/main.less')
.pipe(plumber(function(error) {
gutil.log(gutil.colors.red('Error (' + error.plugin + '): ' + error.message));
// emit the end event, to properly end the task
this.emit('end');
}))
.pipe(gulpif(options.dev, changed('./build')))

3
package.json
View File

@ -59,7 +59,6 @@
"dockerode": "^2.1.1",
"exec": "0.2.0",
"jquery": "^2.1.3",
"minimist": "^1.1.1",
"mixpanel": "0.2.0",
"node-uuid": "^1.4.3",
"object-assign": "^2.0.0",
@ -89,8 +88,10 @@
"gulp-shell": "^0.4.1",
"gulp-sourcemaps": "^1.5.2",
"gulp-util": "^3.0.4",
"gulp": "^3.8.11",
"jest-cli": "kitematic/jest",
"jsxhint": "^0.14.0",
"minimist": "^1.1.1",
"react-tools": "^0.13.1",
"run-sequence": "^1.0.2"
}