Revert "Use grunt-shell instead grunt-exec for Windows"

This reverts commit ffc8e34.
bower · Jan 14, 2015 · e1a2dfc · e1a2dfc
1 parent 30e4bdc
commit e1a2dfc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -32,20 +32,15 @@ module.exports = function (grunt) {
                 src: ['test/test.js']
             }
         },
-        shell: {
+        exec: {
             assets: {
                 command: 'node test/packages.js && node test/packages-svn.js'
             },
             'assets-force': {
                 command: 'node test/packages.js --force && node test/packages-svn.js --force'
             },
             cover: {
-                command: 'node node_modules/istanbul/lib/cli.js cover --dir ./test/reports node_modules/mocha/bin/_mocha -- -R dot test/test.js',
-                options: {
-                    env: {
-                        STRICT_REQUIRE: '1'
-                    }
-                }
+                command: 'STRICT_REQUIRE=1 node node_modules/istanbul/lib/cli.js cover --dir ./test/reports node_modules/mocha/bin/_mocha -- -R dot test/test.js'
             },
             coveralls: {
                 command: 'node node_modules/.bin/coveralls < test/reports/lcov.info'
@@ -57,9 +52,9 @@ module.exports = function (grunt) {
         }
     });
 
-    grunt.registerTask('assets', ['shell:assets-force']);
-    grunt.registerTask('test', ['jshint', 'shell:assets', 'simplemocha:full']);
-    grunt.registerTask('cover', 'shell:cover');
-    grunt.registerTask('travis', ['jshint', 'shell:assets', 'shell:cover', 'shell:coveralls']);
+    grunt.registerTask('assets', ['exec:assets-force']);
+    grunt.registerTask('test', ['jshint', 'exec:assets', 'simplemocha:full']);
+    grunt.registerTask('cover', 'exec:cover');
+    grunt.registerTask('travis', ['jshint', 'exec:assets', 'exec:cover', 'exec:coveralls']);
     grunt.registerTask('default', 'test');
 };
diff --git a/package.json b/package.json
@@ -66,7 +66,7 @@
     "grunt-cli": "^0.1.13",
     "grunt-contrib-jshint": "~0.10.0",
     "grunt-contrib-watch": "~0.6.1",
-    "grunt-shell": "^1.1.1",
+    "grunt-exec": "~0.4.6",
     "grunt-simple-mocha": "~0.4.0",
     "istanbul": "~0.3.5",
     "load-grunt-tasks": "~2.0.0",