aboutsummaryrefslogtreecommitdiff
path: root/node_modules/shelljs/src/common.js
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/shelljs/src/common.js')
-rw-r--r--node_modules/shelljs/src/common.js28
1 files changed, 22 insertions, 6 deletions
diff --git a/node_modules/shelljs/src/common.js b/node_modules/shelljs/src/common.js
index f5197d8ec..4a1f43456 100644
--- a/node_modules/shelljs/src/common.js
+++ b/node_modules/shelljs/src/common.js
@@ -38,6 +38,7 @@ var DEFAULT_CONFIG = {
silent: false,
verbose: false,
execPath: null,
+ bufLength: 64 * 1024, // 64KB
};
var config = {
@@ -66,9 +67,6 @@ exports.state = state;
delete process.env.OLDPWD; // initially, there's no previous directory
-var platform = os.type().match(/^Win/) ? 'win' : 'unix';
-exports.platform = platform;
-
// This is populated by calls to commonl.wrap()
var pipeMethods = [];
@@ -260,15 +258,33 @@ function expand(list) {
if (typeof listEl !== 'string') {
expanded.push(listEl);
} else {
- var ret = glob.sync(listEl, config.globOptions);
- // if glob fails, interpret the string literally
- expanded = expanded.concat(ret.length > 0 ? ret : [listEl]);
+ var ret;
+ try {
+ ret = glob.sync(listEl, config.globOptions);
+ // if nothing matched, interpret the string literally
+ ret = ret.length > 0 ? ret : [listEl];
+ } catch (e) {
+ // if glob fails, interpret the string literally
+ ret = [listEl];
+ }
+ expanded = expanded.concat(ret);
}
});
return expanded;
}
exports.expand = expand;
+// Normalizes Buffer creation, using Buffer.alloc if possible.
+// Also provides a good default buffer length for most use cases.
+var buffer = typeof Buffer.alloc === 'function' ?
+ function (len) {
+ return Buffer.alloc(len || config.bufLength);
+ } :
+ function (len) {
+ return new Buffer(len || config.bufLength);
+ };
+exports.buffer = buffer;
+
// Normalizes _unlinkSync() across platforms to match Unix behavior, i.e.
// file can be unlinked even if it's read-only, see https://github.com/joyent/node/issues/3006
function unlinkSync(file) {