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

cliverse.js

@@ -25,9 +25,10 @@ function nodeShellExec() {
           });
         }
         child.on('close', (code) => {
-          if(+code !== 0 || opts.haserrors) success = false;
+          var logEntry = { code, success }
+          if(+code !== 0 || opts.haserrors) { success = false; logEntry = { result: `${opts.title} exited with code ${code}`, success, code }};
           if(opts.stdio !== 'ignore') {
-            var logEntry = { result: `${opts.title} exited with code ${code}`, messages }
+            logEntry = { result: `${opts.title} exited with code ${code}`, messages,  code }
             logEntry.success = success;
   
             if(opts.runas){

index.js

@@ -509,6 +509,9 @@ var op = {
   , 'is-git-repo': (dir) => {
     return nodeShellExec('git', ['-C', dir.name, 'rev-parse'], { stdio: 'ignore' })
   }
+  // git remote equivalents...
+  // git branch --set-upstream-to=elixir-unc/master master
+  // git push --set-upstream elixir-unc branch..
   , 'set-url': (remotename, url) => {
     var pushable = processedArgs.pushable || false;
     remotename = remotename || processedArgs._[1]
@@ -528,7 +531,7 @@ var op = {
     }
 
     var perform_git_seturl = (dir) => {
-      op['is-git-repo'](dir).then((code) => {
+      op['is-git-repo'](dir).then((logEntry) => {
         any(serial_perform_git_seturl(dir.name).map(x))
       }).catch((e) => {
         // console.log('Failed : ' + dir.name)
@@ -571,9 +574,9 @@ var op = {
       // return Promise.resolve(true)
     }
     var perform_git_add = (dir) => {
-      op['is-git-repo'](dir).then((code) => {
+      op['is-git-repo'](dir).then((logEntry) => {
         // console.log(code)
-        if (code) {
+        if (logEntry.success) {
           nodeShellExec('git', ['remote', 'get-url', remotename], { cwd: dir.name, stdio: 'ignore' }).then(() => {
             console.log('skipped : ' + dir.name + ', reason : A remote with same name already exists.')
           })
@@ -608,7 +611,7 @@ var op = {
       // return Promise.resolve(true)
     }
     var perform_git_remove = (dir) => {
-      op['is-git-repo'](dir).then((code) => {
+      op['is-git-repo'](dir).then((logEntry) => {
         // console.log(code)
         // if (code) {
           nodeShellExec('git', ['remote', 'get-url', remotename], { cwd: dir.name, stdio: 'ignore' }).then(() => {
@@ -648,9 +651,9 @@ var op = {
       // return Promise.resolve(true)
     }
     var perform_init_gitea = (dir) => {
-      op['is-git-repo'](dir).then((code) => {
+      op['is-git-repo'](dir).then((logEntry) => {
         // console.log(code)
-        if (code) {
+        if (logEntry.success) {
           nodeShellExec('git', ['remote', 'get-url', 'chess'], { cwd: dir.name, stdio: 'ignore' }).then(() => {
             console.log('skipped : ' + dir.name + ', reason : Already has remote chess ')
           })
@@ -1903,25 +1906,39 @@ acquireElevationState().then(() => {
     return chessinstances
   }
 
+
+  var noprerequisites = {
+    add : true
+  }
+  var skipprereqs = {}
   var maintask = () => {
     
     // Default cmd to run !
     processedArgs._[0] === processedArgs._[0] || 'pull';  
     // selectedinstance.reposerver = repomanifest.reposervers[0] // PB : TODO -- Attempt first one that is available and online from all that are available...
       
-    return prerequisites.git.verifyAndInstall().then(()=>{
-      var e = { message : 'verifyAndInstall', success : true}
-      return acquireConfig(selectedinstance, chessinstances).catch((err) => {
-        e = err;
-        console.error('Chosen cofiguraton failed or not found. Fix config and rerun or chose another.')
-        console.error(err)
-      }).then(() => { return elxrworker(true) })
-      // .finally(()=>{
-      //   fs.writeFileSync('run.log', ', ' + JSON.stringify({ error: e.message }), { 'flag': 'a+' })
-      //   if(!e.success) fs.writeFileSync('run.done', 'error');
-      //   // return process.exit()
-      // })
-    })
+    if(!noprerequisites[processedArgs._[0]]
+        && !skipprereqs[processedArgs._[0]]
+      ) {
+      return prerequisites.git.verifyAndInstall().then(()=>{
+        var e = { message : 'verifyAndInstall', success : true}
+        return acquireConfig(selectedinstance, chessinstances).catch((err) => {
+          e = err;
+          console.error('Chosen cofiguraton failed or not found. Fix config and rerun or chose another.')
+          console.error(err)
+        }).then(() => { return elxrworker(true) })
+        // .finally(()=>{
+        //   fs.writeFileSync('run.log', ', ' + JSON.stringify({ error: e.message }), { 'flag': 'a+' })
+        //   if(!e.success) fs.writeFileSync('run.done', 'error');
+        //   // return process.exit()
+        // })
+      })
+    }
+    else {
+      console.log('cmd has no preqs or has been configured to skip preqs')
+      return elxrworker()
+    }
+
   }
 
   const retaincount = 2