github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 05:48:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mb-ns-mitigate-leaks

Browse Source
This commit is contained in:
Max Brunsfeld
2017-01-03 15:33:56 -08:00
parent 8277f69d45 c4ceb40f04
commit d1a52b6db8
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
LICENSE.md
View File

@@ -1,4 +1,4 @@
Copyright (c) 2011-2016 GitHub Inc.
Copyright (c) 2011-2017 GitHub Inc.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the

1
docs/build-instructions/build-status.md
View File

@@ -70,6 +70,7 @@
| [Oniguruma](https://github.com/atom/node-oniguruma) | [![macOS Build Status](https://travis-ci.org/atom/node-oniguruma.svg?branch=master)](https://travis-ci.org/atom/node-oniguruma) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/s9twhi451ef2butr/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/node-oniguruma/branch/master) | [![Dependency Status](https://david-dm.org/atom/node-oniguruma.svg)](https://david-dm.org/atom/node-oniguruma) |
| [PathWatcher](https://github.com/atom/node-pathwatcher) | [![macOS Build Status](https://travis-ci.org/atom/node-pathwatcher.svg?branch=master)](https://travis-ci.org/atom/node-pathwatcher) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/li8dkoucdrc2ryts/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/node-pathwatcher) | [![Dependency Status](https://david-dm.org/atom/node-pathwatcher/status.svg)](https://david-dm.org/atom/node-pathwatcher) |
| [Property Accessors](https://github.com/atom/property-accessors) | [![macOS Build Status](https://travis-ci.org/atom/property-accessors.svg?branch=master)](https://travis-ci.org/atom/property-accessors) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/ww4d10hi4v5h7kbp/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/property-accessors/branch/master) | [![Dependency Status](https://david-dm.org/atom/property-accessors.svg)](https://david-dm.org/atom/property-accessors) |
| [Season](https://github.com/atom/season) | [![macOS Build Status](https://travis-ci.org/atom/season.svg?branch=master)](https://travis-ci.org/atom/season) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/v3bth3ooq5q8k8lx/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/season) | [![Dependency Status](https://david-dm.org/atom/season.svg)](https://david-dm.org/atom/season) |
| [TextBuffer](https://github.com/atom/text-buffer) | [![macOS Build Status](https://travis-ci.org/atom/text-buffer.svg?branch=master)](https://travis-ci.org/atom/text-buffer) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/48xl8do1sm2thf5p/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/text-buffer/branch/master) | [![Dependency Status](https://david-dm.org/atom/text-buffer.svg)](https://david-dm.org/atom/text-buffer) |
| [Underscore-Plus](https://github.com/atom/underscore-plus) | [![macOS Build Status](https://travis-ci.org/atom/underscore-plus.svg?branch=master)](https://travis-ci.org/atom/underscore-plus) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/c7l8009vgpaojxcd/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/underscore-plus/branch/master) | [![Dependency Status](https://david-dm.org/atom/underscore-plus.svg)](https://david-dm.org/atom/underscore-plus) |

16
package.json
View File

@@ -124,23 +124,23 @@
"symbols-view": "0.114.0",
"tabs": "0.103.1",
"timecop": "0.33.2",
"tree-view": "0.211.1",
"tree-view": "0.212.0",
"update-package-dependencies": "0.10.0",
"welcome": "0.35.2",
"whitespace": "0.36.1",
"wrap-guide": "0.39.0",
"language-c": "0.54.0",
"language-c": "0.54.1",
"language-clojure": "0.22.1",
"language-coffee-script": "0.48.2",
"language-csharp": "0.13.0",
"language-csharp": "0.14.0",
"language-css": "0.41.0",
"language-gfm": "0.88.0",
"language-git": "0.19.0",
"language-go": "0.43.0",
"language-html": "0.47.1",
"language-hyperlink": "0.16.1",
"language-java": "0.24.0",
"language-javascript": "0.124.0",
"language-java": "0.25.0",
"language-javascript": "0.125.1",
"language-json": "0.18.3",
"language-less": "0.30.0",
"language-make": "0.22.3",
@@ -150,17 +150,17 @@
"language-php": "0.37.3",
"language-property-list": "0.9.0",
"language-python": "0.45.1",
"language-ruby": "0.70.3",
"language-ruby": "0.70.4",
"language-ruby-on-rails": "0.25.1",
"language-sass": "0.57.1",
"language-shellscript": "0.24.0",
"language-source": "0.9.0",
"language-sql": "0.25.1",
"language-sql": "0.25.2",
"language-text": "0.7.1",
"language-todo": "0.29.1",
"language-toml": "0.18.1",
"language-xml": "0.34.13",
"language-yaml": "0.27.1"
"language-yaml": "0.27.2"
},
"private": true,
"scripts": {

2
src/buffered-process.js
View File

@@ -79,7 +79,7 @@ export default class BufferedProcess {
}
// The command itself is quoted if it contains spaces, &, ^ or | chars
cmdArgs.unshift(/\s|&|\^|\|/.test(command) ? `\"${command}\"` : command)
cmdArgs.unshift(/\s|&|\^|\(|\)|\|/.test(command) ? `\"${command}\"` : command)
const cmdOptions = _.clone(options)
cmdOptions.windowsVerbatimArguments = true