Quellcode durchsuchen

Merge branch 'master' of blesson/elxr into master

production
chess vor 3 Jahren
Ursprung
Commit
53061004b1
1 geänderte Dateien mit 25 neuen und 11 gelöschten Zeilen
  1. 25
    11
      index.js

+ 25
- 11
index.js Datei anzeigen

@@ -629,11 +629,22 @@ var op = {

dirs(perform_git_seturl)
}
, 'add': (remotename, url, branch) => {
, 'remote add': (args) => {

// args === processedArgs ? args = {} : null;
var __args = {
remotename : args.remotename|| processedArgs._[2]
, url : args.url || processedArgs._[3]
, branch : args.branch || processedArgs._[4]
}
var remotename = __args.remotename
var url = __args.url
var branch = __args.branch

var pushable = processedArgs.pushable || false;
remotename = remotename || processedArgs._[1]
url = url || processedArgs._[2]
branch = branch || processedArgs._[3]


var serial_perform_git_add = (repo) => {
var options = { cwd: instanceroot + '/' + repo }
// console.log(repo)
@@ -669,18 +680,18 @@ var op = {
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.')
})
.catch((e) => {
any(serial_perform_git_add(dir.name).map(x))
})
.catch((e) => {
any(serial_perform_git_add(dir.name).map(x))
})
}
// else console.log('Skipped : Not a Git Repo : ' + dir.name)
}).catch((e) => {
// console.log('Failed : ' + dir.name)
console.log('Failed : ' + dir.name)
})
}

const { readdir } = require("fs").promises
dirs(perform_git_add)
}
, 'remote remove': (args) => {
@@ -2310,9 +2321,12 @@ acquireElevationState().then(() => {
// PB : TODO -- processedArgs should already be part of selected.
var instanceName = processedArgs._[1] = processedArgs._[1] || chessinstances.current_run.instanceName || selected.instanceName;
var node_env = processedArgs.node_env = processedArgs.node_env || chessinstances.current_run.node_env || selected.node_env;
chessinstances[instanceName] = chessinstances[instanceName] || {}
chessinstances[instanceName][node_env] = chessinstances[instanceName][node_env] || selected;
chessinstances['current_run'] = chessinstances[instanceName][selected.node_env] ?
{ instanceName: instanceName, node_env: node_env } : chessinstances['current_run']
// chessinstances[chessinstances.current_run.instanceName] = chessinstances[chessinstances.current_run.instanceName] || {}
{ instanceName: instanceName, node_env: node_env } : (chessinstances['current_run'] || { instanceName: instanceName, node_env: node_env })

// chessinstances[chessinstances.current_run.instanceName] = chessinstances[chessinstances.current_run.instanceName] || {}

if(path.normalize(selected.root) !== path.normalize(chessinstances[instanceName][node_env].root)) {
throw "Mismatched chessinstances config found " + chessinstances[instanceName][node_env].root + ' does not match ' + selected.root

Laden…
Abbrechen
Speichern