Merge branch 'master' of http://git.bbh/chess/elxr

index.js

@@ -153,6 +153,8 @@ var dbForLabel = function(label){
   return dbsForLabel[label] || 'mysql'
 }
 
+var gitInstallDir = "C:\\Program Files\\Git\\bin\\sh.exe"
+// var gitInstallDir = "G:\\Installed\\Git\\bin\\sh.exe"
 // Relevant git repos
 var gitRepos = [
   'ember-masonry-grid'
@@ -602,7 +604,7 @@ var __runcmd = function(label){
       var getPullCmd = (repo)=>{
         // console.log(useGitPull)
 
-        var pullCmd = ["C:\\Program Files\\Git\\bin\\sh.exe"
+        var pullCmd = [ gitInstallDir
           , ['-c', 'branch=`git rev-parse --abbrev-ref HEAD`;for i in `git remote`; do git pull $i $branch; done;']
           , { cwd : repo, title : 'pull all origins for ' + repo }]
         // var pullCmd = ['pullall', [], { cwd : repo }]
@@ -899,7 +901,7 @@ var __runcmd = function(label){
           tasks = tasks.concat(
             [
               ()=>{ 
-                var p = nodeShellExec('mklink', ['/D', 'data', runconfig.use + '-data'], {
+                var p = nodeShellExec('mklink', ['/J', 'data', runconfig.use + '-data'], {
                   inherit : true, shell: true
                   , env: process.env
                 }).catch((e)=>{ console.error(e) })