Browse Source

More fixes

pull/4/head
anish 3 years ago
parent
commit
2f0cb5d0b0
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      index.js

+ 3
- 3
index.js View File

// console.log(useGitPull) // console.log(useGitPull)


if(branch) { if(branch) {
var pullCmd = [ gitInstallDir
var pullCmd = [ gitbash
, ['-c', 'for i in `git remote`; do git pull $i ' + branch + '; done;'] , ['-c', 'for i in `git remote`; do git pull $i ' + branch + '; done;']
, { cwd: instanceroot + '/' + repo, title : 'pull all origins for ' + repo }] , { cwd: instanceroot + '/' + repo, title : 'pull all origins for ' + repo }]
} }
return nodeShellExec('git', ['checkout', branch || checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV], { return nodeShellExec('git', ['checkout', branch || checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV], {
// return nodeShellExec('git', ['switch', '-m', '-C', checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV], { // return nodeShellExec('git', ['switch', '-m', '-C', checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV], {
// inherit : true, shell: true, // inherit : true, shell: true,
cwd: repoinstanceroot + '/' + repo
cwd: instanceroot + '/' + repo
// , stdio : ignore // Use when we want to silcence output completely. // , stdio : ignore // Use when we want to silcence output completely.
, runas: processedArgs.runas , runas: processedArgs.runas
, title: `git checkout ${branch || checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV} for ${repo}` , title: `git checkout ${branch || checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV} for ${repo}`
}).catch((e) => { console.error(e); return { error: true, message: repo } })
}).then(()=>{ console.log( `SUCCESS : git checkout ${branch || checkoutMap[runconfig.NODE_ENV] || runconfig.NODE_ENV} for ${repo}` ) }).catch((e) => { console.error(e); return { error: true, message: repo } })
} }
if (runconfig.NODE_ENV === 'development') performCheckout = () => { return Promise.resolve(true) } if (runconfig.NODE_ENV === 'development') performCheckout = () => { return Promise.resolve(true) }



Loading…
Cancel
Save