From f21e5c57dc56014317c4bd401c823456ebb85365 Mon Sep 17 00:00:00 2001
From: Jason San Jose <jasonsj@adobe.com>
Date: Wed, 24 Jul 2013 12:15:18 -0700
Subject: [PATCH 1/2] fetch origin for new branches. fix jshint errors.

---
 tasks/build.js  | 1 +
 tasks/common.js | 4 ++--
 tasks/setup.js  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tasks/build.js b/tasks/build.js
index da3d385dc..a9fb89851 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -93,6 +93,7 @@ module.exports = function (grunt) {
             
             var done = this.async(),
                 promise = spawn([
+                    "git fetch origin",
                     "git checkout " + this.data.branch,
                     "git pull origin " + this.data.branch,
                     "git submodule sync",
diff --git a/tasks/common.js b/tasks/common.js
index 95c69ede2..aef6fed91 100644
--- a/tasks/common.js
+++ b/tasks/common.js
@@ -20,7 +20,7 @@
  * DEALINGS IN THE SOFTWARE.
  * 
  */
-/*jslint es5:true, vars: true, plusplus: true, regexp: true*/
+/*jslint es5:true, vars: true, plusplus: true, regexp: true, nomen: true*/
 /*global module, require, process, Buffer*/
 module.exports = function (grunt) {
     "use strict";
@@ -187,7 +187,7 @@ module.exports = function (grunt) {
                         code: code,
                         stdout: stdout.toString(),
                         stderr: stderr.toString(),
-                        toString: function() {
+                        toString: function () {
                             if (code === 0) {
                                 return this.stdout;
                             } else {
diff --git a/tasks/setup.js b/tasks/setup.js
index fb4222168..2bc82eaed 100644
--- a/tasks/setup.js
+++ b/tasks/setup.js
@@ -90,7 +90,7 @@ module.exports = function (grunt) {
                 grunt.verbose.writeln("Found CEF download " + zipDest);
                 grunt.task.run(["cef-clean", "cef-extract", "cef-symlinks"]);
             } else {
-                grunt.task.run(["cef-download","cef-clean", "cef-extract", "cef-symlinks"]);
+                grunt.task.run(["cef-download", "cef-clean", "cef-extract", "cef-symlinks"]);
             }
         } else {
             grunt.verbose.writeln("Skipping CEF download. Found deps/cef/" + txtName);

From e080a636c53b4d38b71bcecc490f694ad996fd66 Mon Sep 17 00:00:00 2001
From: Jason San Jose <jasonsj@adobe.com>
Date: Thu, 25 Jul 2013 16:12:30 -0700
Subject: [PATCH 2/2] use correct fs.symlink on mac and linux

---
 tasks/setup.js | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/tasks/setup.js b/tasks/setup.js
index 2bc82eaed..e77375248 100644
--- a/tasks/setup.js
+++ b/tasks/setup.js
@@ -45,21 +45,18 @@ module.exports = function (grunt) {
     
     // cross-platform symbolic link
     link = (function () {
-        var symlink;
+        var typeArg,
+            symlink;
         
         if (process.platform === "win32") {
-            symlink = q.denodeify(fs.symlink);
-            
-            return function (srcpath, destpath) {
-                return symlink(srcpath, destpath, "junction");
-            };
-        } else {
-            symlink = q.denodeify(fs.link);
-            
-            return function (srcpath, destpath) {
-                return symlink(srcpath, destpath);
-            };
+            typeArg = "junction";
         }
+        
+        symlink = q.denodeify(fs.symlink);
+        
+        return function (srcpath, destpath) {
+            return symlink(srcpath, destpath, typeArg);
+        };
     }());
     
     function unzip(src, dest) {