Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Electron upgrade #45

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Electron upgrade #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6b5e330
Update to electron 0.37 (chrome 49)
Mar 15, 2016
0094dbd
Version update
Mar 15, 2016
6d20f19
Version update
Mar 15, 2016
74d32c4
History update
Mar 15, 2016
ddff49f
Scaffold adjustment
Mar 15, 2016
8e0464d
Revert "Scaffold adjustment"
Mar 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2.1.5 / 2016-03-15
===================
* upgrading electron to last version

2.1.4 / 2015-12-14
===================
* fixing windows env initialization
Expand All @@ -20,7 +24,7 @@
2.1.0 / 2015-12-08
===================
* Added `preserve_db` option

2.0.2 / 2015-11-09
===================
* Fixing last release (broken due to a wrong variable inside a conditional)
Expand Down Expand Up @@ -134,4 +138,4 @@

1.0.0 / 2015-07-12
===================
* Hello World
* Hello World
12 changes: 6 additions & 6 deletions lib/env.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ function Env(input, output, settings, cli) {
var join = path.join;

// electrify version
this.version = '2.1.4';
this.version = '2.1.5';

// is running through cli?
this.running_through_cli = !!cli;
Expand Down Expand Up @@ -59,7 +59,7 @@ function Env(input, output, settings, cli) {
this.app.dist = output || join(this.app.root, '.dist');
this.app.config_path = join(this.app.root, 'electrify.json');
this.app.pkg_path = join(this.app.root, 'package.json');

if(fs.existsSync(this.app.config_path))
this.app.config = require(this.app.config_path);

Expand All @@ -73,7 +73,7 @@ function Env(input, output, settings, cli) {
this.app.user_data_dir = join(process.env.HOME, 'Library', 'Preferences');
else if(this.os.is_linux)
this.app.user_data_dir = join(process.env.HOME, 'var', 'local');

if(this.app.pkg)
this.app.data_dir = join(this.app.user_data_dir, this.app.pkg.name);

Expand All @@ -90,10 +90,10 @@ function Env(input, output, settings, cli) {
this.core = {};
this.core.tmp = join(this.os.tmp, 'electrify');
this.core.root = join(this.core.tmp, 'core');

// meteor's info from system (only when not packaged yet)
if(this.app.isnt_packaged) {

var meteor_dir, meteor_bat, meteor_symlink;

this.meteor = {};
Expand Down Expand Up @@ -137,4 +137,4 @@ function Env(input, output, settings, cli) {
console.log(JSON.stringify(this, null, 2));
console.log('====================================');
}
}
}
6 changes: 3 additions & 3 deletions package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var VERSION = '2.1.4';
var VERSION = '2.1.5';

Package.describe({
name: 'arboleya:electrify',
Expand All @@ -21,6 +21,6 @@ Package.onUse(function(api) {
// the npm module informed inside Npm.depends() above
api.addFiles('meteor/vendors/sockjs-client.js', ['client'], {bare: true});
api.addFiles('meteor/index.js', ['server', 'client']);

api.export('Electrify');
});
});
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "electrify",
"version": "2.1.4",
"version": "2.1.5",
"main": "lib/index.js",
"bin": {
"electrify": "bin/cli.js"
Expand All @@ -13,8 +13,8 @@
"license": "MIT",
"dependencies": {
"commander": "^2.8.1",
"electron-packager": "^5.1.1",
"electron-prebuilt": "^0.35.4",
"electron-packager": "5.2.1",
"electron-prebuilt": "0.37.2",
"lodash": "^3.10.1",
"server-destroy": "^1.0.1",
"shelljs": "^0.5.3",
Expand Down