浏览代码

Merge branch 'master' of mohan/elxr into master

production
chess 3 年前
父节点
当前提交
99d2b08d4d
共有 2 个文件被更改,包括 34 次插入6 次删除
  1. 12
    6
      index.js
  2. 22
    0
      repolog.js

+ 12
- 6
index.js 查看文件

@@ -1,4 +1,4 @@

var repolog = require('./repolog')
// 'use strict';

// PB : TODO -- make sure folder context is proper coz we can now run elxr from anywhere.
@@ -721,11 +721,10 @@ var __runcmd = function(label){

var performPull = (repo) => {
if(existsSync(repo)) {
console.log('pulling ' + repo)
return nodeShellExec.apply(null, getPullCmd(repo)).catch((e)=>{ console.error(e) })
return nodeShellExec.apply(null, getPullCmd(repo)).then((srepo)=>{
repolog.statuslog(null, srepo)}).catch((e)=>{ console.error(e) })
}
else {
console.log('cloning ' + repo)
// PB : TODO -- detect if a clonable repo exists in currentGitAuthUser
return nodeShellExec('git', ['clone', '-c', 'core.symlinks=true', defaultRepoServer + `/${defaultRepoOwner}/` + repo + '.git'],
{
@@ -746,7 +745,15 @@ var __runcmd = function(label){
}
}

if(!processedArgs.runas) gitRepos.forEach(performPull)
if(!processedArgs.runas) {
var pendingpulls = [];
gitRepos.forEach( (r)=>{
pendingpulls.push(performPull(r))
} )
Promise.all(pendingpulls).then(results =>{
console.log(repolog.log.SUCCESS)
})
}
return isRunningElevated().then(
(isElevated) => {
if(isElevated) {
@@ -1201,4 +1208,3 @@ function nodeShellExec() {
p.process = child;
return p;
}


+ 22
- 0
repolog.js 查看文件

@@ -0,0 +1,22 @@
var log = {
SUCCESS : []
, ERROR : []
, FAIL : []
}

var statuslog = function (err, data){
if(err)
{
log.ERROR.push(data)
}
else
{
log.SUCCESS.push(data)
}
}

module.exports = {
'log' : log
, 'statuslog' : statuslog
}

正在加载...
取消
保存