Clean up pull request.

README.md

@@ -33,7 +33,7 @@ If the exit code generated by the specified shell command is greater than 0, gru
 *   __command__: The shell command to be executed. Must be a string or a function that returns a string. (alias: __cmd__)
 *   __stdout__: If `true`, stdout will be printed. Defaults to `true`.
 *   __stderr__: If `true`, stderr will be printed. Defaults to `true`.
-*   __cwd__: Current working directory of the shell command. Defaults to Gruntfile location directory.
+*   __cwd__: Current working directory of the shell command. Defaults to the directory containing your Gruntfile.
 
 ### Command Functions
 
@@ -129,5 +129,5 @@ For more information on semantic versioning, please visit http://semver.org/.
 License
 -------
 
-Copyright (c) 2012 [Jake Harding](http://thejakeharding.com)
+Copyright (c) 2012 [Jake Harding](http://thejakeharding.com)  
 Licensed under the MIT License.

tasks/exec.js

@@ -14,11 +14,11 @@ module.exports = function(grunt) {
   grunt.registerMultiTask('exec', 'Execute shell commands.', function() {
     var data = this.data
       , o = {
-          stdout: data.stdout !== undefined ? data.stdout : true
+          cwd: data.cwd
+        , stdout: data.stdout !== undefined ? data.stdout : true
         , stderr: data.stderr !== undefined ? data.stderr : true
         }
       , command
-      , cpopts = data.cwd && {cwd: data.cwd}
       , childProcess
       , args = [].slice.call(arguments, 0)
       , done = this.async();
@@ -42,7 +42,7 @@ module.exports = function(grunt) {
     }
 
     verbose.subhead(command);
-    childProcess = cp.exec(command, cpopts);
+    childProcess = o.cwd ? cp.exec(command, { cwd: o.cwd }) : cp.exec(command);
 
     o.stdout && childProcess.stdout.on('data', function (d) { log.write(d); });
     o.stderr && childProcess.stderr.on('data', function (d) { log.error(d); });