From 38c8dcb22dc7742d6dbe6ca472b115794331b0b9 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Fri, 17 Apr 2015 10:23:23 -0400 Subject: [PATCH 1/4] Rename atom shell to electron --- gulpfile.js | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 4c1b05b3e2..7a37f6a387 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,7 +2,7 @@ var babel = require('gulp-babel'); var changed = require('gulp-changed'); var concat = require('gulp-concat'); var cssmin = require('gulp-cssmin'); -var downloadatomshell = require('gulp-download-atom-shell'); +var downloadelectron = require('gulp-download-atom-shell'); var fs = require('fs'); var gulp = require('gulp'); var gulpif = require('gulp-if'); @@ -76,8 +76,8 @@ gulp.task('styles', function () { }); gulp.task('download', function (cb) { - downloadatomshell({ - version: packagejson['atom-shell-version'], + downloadelectron({ + version: packagejson['electron-version'], outputDir: 'cache' }, cb); }); diff --git a/package.json b/package.json index eb834ed4e6..789613df83 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ }, "docker-version": "1.6.0", "docker-machine-version": "0.2.0", - "atom-shell-version": "0.23.0", + "electron-version": "0.24.0", "virtualbox-version": "4.3.26", "virtualbox-filename": "VirtualBox-4.3.26.pkg", "virtualbox-checksum": "668f61c95efe37f8fc65cafe95b866fba64e37f2492dfc1e2b44a7ac3dcafa3b", From b9887a3709d8ba870f9c032b69e50e9008ac287d Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Fri, 17 Apr 2015 10:26:14 -0400 Subject: [PATCH 2/4] Changing docs to electron Signed-off-by: Jeffrey Morgan --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f0a4c54814..209f81f62e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,7 +36,7 @@ To run the app in development: **Note: This architecture is work in progress and doesn't reflect the current state of the app, yet!** -Kitematic is an application built using [atom-shell](https://github.com/atom/atom-shell) and is powered by the [Docker Engine](https://github.com/docker/docker). While it's work in progress, the goal is to make Kitematic a high-performance, portable Javascript ES6 application built with React and Reflux. It adopts a single data flow pattern: +Kitematic is an application built using [electron](https://github.com/atom/electron) and is powered by the [Docker Engine](https://github.com/docker/docker). While it's work in progress, the goal is to make Kitematic a high-performance, portable Javascript ES6 application built with React and Reflux. It adopts a single data flow pattern: ``` ╔═════════╗ ╔════════╗ ╔═════════════════╗ From 614e034167ac7a29ebc8835e68c7ec9b9d9f048f Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Fri, 17 Apr 2015 11:01:18 -0400 Subject: [PATCH 3/4] Fixing download Signed-off-by: Jeffrey Morgan --- gulpfile.js | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7a37f6a387..1029d73663 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -2,7 +2,7 @@ var babel = require('gulp-babel'); var changed = require('gulp-changed'); var concat = require('gulp-concat'); var cssmin = require('gulp-cssmin'); -var downloadelectron = require('gulp-download-atom-shell'); +var downloadelectron = require('gulp-download-electron'); var fs = require('fs'); var gulp = require('gulp'); var gulpif = require('gulp-if'); @@ -97,14 +97,14 @@ gulp.task('dist', function () { var stream = gulp.src('').pipe(shell([ 'rm -Rf dist', 'mkdir -p ./dist/osx', - 'cp -R ./cache/Atom.app ./dist/osx/<%= filename %>', - 'mv ./dist/osx/<%= filename %>/Contents/MacOS/Atom ./dist/osx/<%= filename %>/Contents/MacOS/<%= name %>', + 'cp -R ./cache/Electron.app ./dist/osx/<%= filename %>', + 'mv ./dist/osx/<%= filename %>/Contents/MacOS/Electron ./dist/osx/<%= filename %>/Contents/MacOS/<%= name %>', 'mkdir -p ./dist/osx/<%= filename %>/Contents/Resources/app', 'mkdir -p ./dist/osx/<%= filename %>/Contents/Resources/app/node_modules', 'cp package.json dist/osx/<%= filename %>/Contents/Resources/app/', 'mkdir -p dist/osx/<%= filename %>/Contents/Resources/app/resources', 'cp -v resources/* dist/osx/<%= filename %>/Contents/Resources/app/resources/ || :', - 'cp <%= icon %> dist/osx/<%= filename %>/Contents/Resources/atom.icns', + 'cp <%= icon %> dist/osx/<%= filename %>/Contents/Resources/electron.icns', 'cp ./util/Info.plist dist/osx/<%= filename %>/Contents/Info.plist', '/usr/libexec/PlistBuddy -c "Set :CFBundleVersion <%= version %>" dist/osx/<%= filename %>/Contents/Info.plist', '/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName <%= name %>" dist/osx/<%= filename %>/Contents/Info.plist', @@ -181,7 +181,7 @@ gulp.task('default', ['download', 'copy', 'js', 'images', 'styles'], function () var env = process.env; env.NODE_ENV = 'development'; - gulp.src('').pipe(shell(['./cache/Atom.app/Contents/MacOS/Atom .'], { + gulp.src('').pipe(shell(['./cache/Electron.app/Contents/MacOS/Electron .'], { env: env })); }); diff --git a/package.json b/package.json index 789613df83..fc2173897e 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "gulp-changed": "^1.2.1", "gulp-concat": "^2.5.2", "gulp-cssmin": "^0.1.6", - "gulp-download-atom-shell": "0.0.4", + "gulp-download-electron": "^0.0.5", "gulp-if": "^1.2.5", "gulp-insert": "^0.4.0", "gulp-less": "^3.0.2", From 1d00ca197c97323b557322535dc35f53f4192ed2 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Fri, 17 Apr 2015 11:23:57 -0400 Subject: [PATCH 4/4] Fix signing errors --- gulpfile.js | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 1029d73663..ae62be14b2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -104,7 +104,7 @@ gulp.task('dist', function () { 'cp package.json dist/osx/<%= filename %>/Contents/Resources/app/', 'mkdir -p dist/osx/<%= filename %>/Contents/Resources/app/resources', 'cp -v resources/* dist/osx/<%= filename %>/Contents/Resources/app/resources/ || :', - 'cp <%= icon %> dist/osx/<%= filename %>/Contents/Resources/electron.icns', + 'cp <%= icon %> dist/osx/<%= filename %>/Contents/Resources/atom.icns', 'cp ./util/Info.plist dist/osx/<%= filename %>/Contents/Info.plist', '/usr/libexec/PlistBuddy -c "Set :CFBundleVersion <%= version %>" dist/osx/<%= filename %>/Contents/Info.plist', '/usr/libexec/PlistBuddy -c "Set :CFBundleDisplayName <%= name %>" dist/osx/<%= filename %>/Contents/Info.plist', @@ -138,9 +138,19 @@ gulp.task('sign', function () { try { var signing_identity = fs.readFileSync('./identity', 'utf8').trim(); return gulp.src('').pipe(shell([ - 'codesign --deep --force --verbose --sign "' + signing_identity + '" ' + options.appFilename.replace(' ', '\\ ').replace('(','\\(').replace(')','\\)') + 'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Electron\\ Framework.framework', + 'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Electron\\ Helper\\ EH.app', + 'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Electron\\ Helper\\ NP.app', + 'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Electron\\ Helper.app', + 'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/ReactiveCocoa.framework', + 'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Squirrel.framework', + 'codesign --deep --force --verbose --sign <%= identity %> <%= filename %>/Contents/Frameworks/Mantle.framework', + 'codesign --force --verbose --sign <%= identity %> <%= filename %>', ], { - cwd: './dist/osx/' + templateData: { + filename: 'dist/osx/' + options.appFilename.replace(' ', '\\ ').replace('(','\\(').replace(')','\\)'), + identity: '\"' + signing_identity + '\"' + } })); } catch (error) { gutil.log(gutil.colors.red('Error: ' + error.message));