Bläddra i källkod

sync master fixes

master
samuel 4 år sedan
förälder
incheckning
c75cff5236
1 ändrade filer med 16 tillägg och 9 borttagningar
  1. 16
    9
      index.js

+ 16
- 9
index.js Visa fil

} }
} }


var getPullCmd = (repo) => { var getPullCmd = (repo, branch) => {
// console.log(useGitPull) // console.log(useGitPull)


var pullCmd = [gitInstallDir if(branch) {
, ['-c', 'branch=`git rev-parse --abbrev-ref HEAD`;for i in `git remote`; do git pull $i $branch; done;'] var pullCmd = [ gitInstallDir
, { cwd: repo, title: 'pull all origins for ' + repo }] , ['-c', 'for i in `git remote`; do git pull $i ' + branch + '; done;']
, { cwd : repo, title : 'pull all origins for ' + repo }]
}
else {
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 }] // var pullCmd = ['pullall', [], { cwd : repo }]
if (useGitPull) pullCmd = ['git', ['pull'], { if (useGitPull) pullCmd = ['git', ['pull'], {
inherit: true, shell: true, inherit: true, shell: true,
return pullCmd return pullCmd
} }


var performPull = (repo) => { var performPull = (repo, branch) => {
if (existsSync(instanceroot + '/' + repo)) { if (existsSync(instanceroot + '/' + repo)) {
console.log('pulling ' + instanceroot + '/' + repo) console.log('pulling ' + instanceroot + '/' + repo + 'branch ' + branch)
return nodeShellExec.apply(null, getPullCmd(repo)).then(() => { return nodeShellExec.apply(null, getPullCmd(repo, branch)).then(() => {
if (__isElevated) { if (__isElevated) {
fs.writeFileSync('run.log', ', ' + JSON.stringify({ repo, success: true }), { 'flag': 'a+' }) fs.writeFileSync('run.log', ', ' + JSON.stringify({ repo, success: true }), { 'flag': 'a+' })
} }
// console.dir(env) // console.dir(env)
console.log('Running exlr pull : ' + path.dirname(__dirname)) console.log('Running exlr pull : ' + path.dirname(__dirname))


if (!processedArgs.runas) gitRepos.forEach(performPull) if (!processedArgs.runas) gitRepos.map((repo) => performPull(repo, 'master'))
if (__isElevated) { if (__isElevated) {
return any(elevatedRunasRepos.map((repo) => performPull(repo))).then(() => { return any(elevatedRunasRepos.map((repo) => performPull(repo, 'master'))).then(() => {
fs.writeFileSync('run.done', 'success') fs.writeFileSync('run.done', 'success')
}).catch(() => { }).catch(() => {
fs.writeFileSync('run.done', 'error') fs.writeFileSync('run.done', 'error')

Laddar…
Avbryt
Spara