quine-global/hyper
1
0
Fork 0
mirror of https://github.com/quine-global/hyper.git synced 2026-01-16 21:58:39 -09:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into v2

Browse source 
* master:
  Revert #2126 (#2202)
  Use child_process.execFile to prevent unescaped stuff (#2206)
  1.4.4
This commit is contained in:
CHaBou 2017-09-16 13:23:24 +02:00
commit 507fc28200
No known key found for this signature in database
GPG key ID: EF8D073B729A0B33
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/config/init.js
View file

@ -1,5 +1,4 @@
const vm = require('vm'); const vm = require('vm');
const merge = require('lodash/merge');
const notify = require('../notify'); const notify = require('../notify');
const _extract = function(script) { const _extract = function(script) {
@ -38,9 +37,6 @@ const _init = function(cfg) {
return _extractDefault(cfg.defaultCfg); return _extractDefault(cfg.defaultCfg);
} }
// Use options from default config when not specified in user config #1588
_cfg.config = merge(_extractDefault(cfg.defaultCfg).config, _cfg.config);
// Ignore undefined values in plugin and localPlugins array Issue #1862 // Ignore undefined values in plugin and localPlugins array Issue #1862
_cfg.plugins = (_cfg.plugins && _cfg.plugins.filter(Boolean)) || []; _cfg.plugins = (_cfg.plugins && _cfg.plugins.filter(Boolean)) || [];
_cfg.localPlugins = (_cfg.localPlugins && _cfg.localPlugins.filter(Boolean)) || []; _cfg.localPlugins = (_cfg.localPlugins && _cfg.localPlugins.filter(Boolean)) || [];

3
app/package.json
View file

@ -2,7 +2,7 @@
"name": "hyper", "name": "hyper",
"productName": "Hyper", "productName": "Hyper",
"description": "A terminal built on web technologies", "description": "A terminal built on web technologies",
"version": "1.4.3", "version": "1.4.4",
"license": "MIT", "license": "MIT",
"author": { "author": {
"name": "Zeit, Inc.", "name": "Zeit, Inc.",
@ -19,7 +19,6 @@
"electron-config": "1.0.0", "electron-config": "1.0.0",
"electron-is-dev": "0.3.0", "electron-is-dev": "0.3.0",
"electron-squirrel-startup": "1.0.0", "electron-squirrel-startup": "1.0.0",
"lodash": "4.17.4",
"file-uri-to-path": "1.0.0", "file-uri-to-path": "1.0.0",
"git-describe": "4.0.2", "git-describe": "4.0.2",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",

9
app/plugins/install.js
View file

@ -16,14 +16,14 @@ module.exports = {
//eslint-disable-next-line no-console //eslint-disable-next-line no-console
console.log('Launching yarn:', cmd); console.log('Launching yarn:', cmd);
cp.exec( cp.execFile(
cmd, process.execPath,
[yarn].concat(args),
{ {
cwd: plugs.base, cwd: plugs.base,
env, env,
shell: true,
timeout: ms('5m'), timeout: ms('5m'),
stdio: ['ignore', 'ignore', 'inherit'] maxBuffer: 1024 * 1024
}, },
err => { err => {
if (err) { if (err) {
@ -31,7 +31,6 @@ module.exports = {
} else { } else {
cb(null); cb(null);
} }
end(); end();
spawnQueue.start(); spawnQueue.start();
} }