Merge pull request #167 from benjamn/issue-166-fix-phantomjs-executability

Ensure that the phantomjs binary has appropriate UNIX mode
This commit is contained in:
Ben Newman
2013-07-05 16:18:05 -07:00
2 changed files with 10 additions and 8 deletions
+1 -2
View File
@@ -2,7 +2,6 @@
var assert = require("assert");
var path = require("path");
var tmp = require("tmp");
var grunt = require("grunt");
var spawn = grunt.util.spawn;
@@ -48,7 +47,7 @@ module.exports = function() {
grunt.log.writeln("Packing " + tgz + " (this could take a while)...");
run("npm", ["pack", "--verbose", "."], function() {
tmp.dir(function(err, dir) {
require("tmp").dir(function(err, dir) {
if (err) {
grunt.log.error(err);
done(false);
+9 -6
View File
@@ -1,6 +1,7 @@
'use strict';
var assert = require("assert");
var fs = require("fs");
var grunt = require("grunt");
var spawn = grunt.util.spawn;
var semver = require("semver");
@@ -58,11 +59,13 @@ module.exports = function() {
var config = this.data;
var done = this.async();
spawn({
cmd: phantomjs,
args: ["--version"]
}, function(error, result, code) {
checkVersion(error, result, code);
run(config, done);
fs.chmod(phantomjs, 755, function(err) {
spawn({
cmd: phantomjs,
args: ["--version"]
}, function(error, result, code) {
checkVersion(error, result, code);
run(config, done);
});
});
};