Clean up the oopsie. Rebuild the blank exercises.

node_modules/cross-spawn/lib/util/escapeArgument.js

@@ -1,30 +0,0 @@
-'use strict';
-
-function escapeArgument(arg, quote) {
-    // Convert to string
-    arg = '' + arg;
-
-    // If we are not going to quote the argument,
-    // escape shell metacharacters, including double and single quotes:
-    if (!quote) {
-        arg = arg.replace(/([()%!^<>&|;,"'\s])/g, '^$1');
-    } else {
-        // Sequence of backslashes followed by a double quote:
-        // double up all the backslashes and escape the double quote
-        arg = arg.replace(/(\\*)"/g, '$1$1\\"');
-
-        // Sequence of backslashes followed by the end of the string
-        // (which will become a double quote later):
-        // double up all the backslashes
-        arg = arg.replace(/(\\*)$/, '$1$1');
-
-        // All other backslashes occur literally
-
-        // Quote the whole thing:
-        arg = '"' + arg + '"';
-    }
-
-    return arg;
-}
-
-module.exports = escapeArgument;

node_modules/cross-spawn/lib/util/escapeCommand.js

@@ -1,12 +0,0 @@
-'use strict';
-
-var escapeArgument = require('./escapeArgument');
-
-function escapeCommand(command) {
-    // Do not escape if this command is not dangerous..
-    // We do this so that commands like "echo" or "ifconfig" work
-    // Quoting them, will make them unaccessible
-    return /^[a-z0-9_-]+$/i.test(command) ? command : escapeArgument(command, true);
-}
-
-module.exports = escapeCommand;

node_modules/cross-spawn/lib/util/hasEmptyArgumentBug.js

@@ -1,18 +0,0 @@
-'use strict';
-
-// See: https://github.com/IndigoUnited/node-cross-spawn/pull/34#issuecomment-221623455
-function hasEmptyArgumentBug() {
-    var nodeVer;
-
-    if (process.platform !== 'win32') {
-        return false;
-    }
-
-    nodeVer = process.version.substr(1).split('.').map(function (num) {
-        return parseInt(num, 10);
-    });
-
-    return (nodeVer[0] === 0 && nodeVer[1] < 12);
-}
-
-module.exports = hasEmptyArgumentBug();

node_modules/cross-spawn/lib/util/readShebang.js

@@ -1,37 +1,32 @@
 'use strict';
 
-var fs = require('fs');
-var LRU = require('lru-cache');
-var shebangCommand = require('shebang-command');
-
-var shebangCache = new LRU({ max: 50, maxAge: 30 * 1000 });  // Cache just for 30sec
+const fs = require('fs');
+const shebangCommand = require('shebang-command');
 
 function readShebang(command) {
-    var buffer;
-    var fd;
-    var shebang;
+    // Read the first 150 bytes from the file
+    const size = 150;
+    let buffer;
 
-    // Check if it is in the cache first
-    if (shebangCache.has(command)) {
-        return shebangCache.get(command);
+    if (Buffer.alloc) {
+        // Node.js v4.5+ / v5.10+
+        buffer = Buffer.alloc(size);
+    } else {
+        // Old Node.js API
+        buffer = new Buffer(size);
+        buffer.fill(0); // zero-fill
     }
 
-    // Read the first 150 bytes from the file
-    buffer = new Buffer(150);
+    let fd;
 
     try {
         fd = fs.openSync(command, 'r');
-        fs.readSync(fd, buffer, 0, 150, 0);
+        fs.readSync(fd, buffer, 0, size, 0);
         fs.closeSync(fd);
-    } catch (e) { /* empty */ }
+    } catch (e) { /* Empty */ }
 
     // Attempt to extract shebang (null is returned if not a shebang)
-    shebang = shebangCommand(buffer.toString());
-
-    // Store the shebang in the cache
-    shebangCache.set(command, shebang);
-
-    return shebang;
+    return shebangCommand(buffer.toString());
 }
 
 module.exports = readShebang;

node_modules/cross-spawn/lib/util/resolveCommand.js

@@ -1,31 +1,47 @@
 'use strict';
 
-var path = require('path');
-var which = require('which');
-var LRU = require('lru-cache');
+const path = require('path');
+const which = require('which');
+const pathKey = require('path-key')();
 
-var commandCache = new LRU({ max: 50, maxAge: 30 * 1000 });  // Cache just for 30sec
+function resolveCommandAttempt(parsed, withoutPathExt) {
+    const cwd = process.cwd();
+    const hasCustomCwd = parsed.options.cwd != null;
 
-function resolveCommand(command, noExtension) {
-    var resolved;
-
-    noExtension = !!noExtension;
-    resolved = commandCache.get(command + '!' + noExtension);
-
-    // Check if its resolved in the cache
-    if (commandCache.has(command)) {
-        return commandCache.get(command);
+    // If a custom `cwd` was specified, we need to change the process cwd
+    // because `which` will do stat calls but does not support a custom cwd
+    if (hasCustomCwd) {
+        try {
+            process.chdir(parsed.options.cwd);
+        } catch (err) {
+            /* Empty */
+        }
     }
 
-    try {
-        resolved = !noExtension ?
-            which.sync(command) :
-            which.sync(command, { pathExt: path.delimiter + (process.env.PATHEXT || '') });
-    } catch (e) { /* empty */ }
+    let resolved;
 
-    commandCache.set(command + '!' + noExtension, resolved);
+    try {
+        resolved = which.sync(parsed.command, {
+            path: (parsed.options.env || process.env)[pathKey],
+            pathExt: withoutPathExt ? path.delimiter : undefined,
+        });
+    } catch (e) {
+        /* Empty */
+    } finally {
+        process.chdir(cwd);
+    }
+
+    // If we successfully resolved, ensure that an absolute path is returned
+    // Note that when a custom `cwd` was used, we need to resolve to an absolute path based on it
+    if (resolved) {
+        resolved = path.resolve(hasCustomCwd ? parsed.options.cwd : '', resolved);
+    }
 
     return resolved;
 }
 
+function resolveCommand(parsed) {
+    return resolveCommandAttempt(parsed) || resolveCommandAttempt(parsed, true);
+}
+
 module.exports = resolveCommand;