Bladeren bron

Elevated Fixes

pull/4/head
chess 3 jaren geleden
bovenliggende
commit
37255a9f72
2 gewijzigde bestanden met toevoegingen van 39 en 31 verwijderingen
  1. 34
    26
      i.js
  2. 5
    5
      index.js

+ 34
- 26
i.js Bestand weergeven

@@ -1,4 +1,4 @@
// Version: 1.0.0 - May 7, 2021 10:41:16
/* Version: 1.0.0 - May 8, 2021 11:38:39 */
'use strict';

var path$1 = require('path');
@@ -16237,14 +16237,17 @@ for (var i$1 = 0; i$1 < 256; ++i$1) {
function bytesToUuid(buf, offset) {
var i = offset || 0;
var bth = byteToHex;
return bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] + '-' +
bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]] +
bth[buf[i++]] + bth[buf[i++]];
// join used to fix memory issue caused by concatenation: https://bugs.chromium.org/p/v8/issues/detail?id=3175#c4
return ([
bth[buf[i++]], bth[buf[i++]],
bth[buf[i++]], bth[buf[i++]], '-',
bth[buf[i++]], bth[buf[i++]], '-',
bth[buf[i++]], bth[buf[i++]], '-',
bth[buf[i++]], bth[buf[i++]], '-',
bth[buf[i++]], bth[buf[i++]],
bth[buf[i++]], bth[buf[i++]],
bth[buf[i++]], bth[buf[i++]]
]).join('');
}

var bytesToUuid_1 = bytesToUuid;
@@ -16261,7 +16264,7 @@ var _clockseq;
var _lastMSecs = 0;
var _lastNSecs = 0;

// See https://github.com/broofa/node-uuid for API details
// See https://github.com/uuidjs/uuid for API details
function v1(options, buf, offset) {
var i = buf && offset || 0;
var b = buf || [];
@@ -20736,6 +20739,9 @@ function range(a, b, str) {
var i = ai;

if (ai >= 0 && bi > 0) {
if(a===b) {
return [ai, bi];
}
begs = [];
left = str.length;

@@ -21947,8 +21953,6 @@ var win32_1 = win32;
pathIsAbsolute.posix = posix_1;
pathIsAbsolute.win32 = win32_1;

var alphasort_1 = alphasort;
var alphasorti_1 = alphasorti;
var setopts_1 = setopts$2;
var ownProp_1 = ownProp$2;
var makeAbs_1 = makeAbs;
@@ -21966,12 +21970,8 @@ function ownProp$2 (obj, field) {

var Minimatch = minimatch_1.Minimatch;

function alphasorti (a, b) {
return a.toLowerCase().localeCompare(b.toLowerCase())
}

function alphasort (a, b) {
return a.localeCompare(b)
return a.localeCompare(b, 'en')
}

function setupIgnores (self, options) {
@@ -22099,7 +22099,7 @@ function finish (self) {
all = Object.keys(all);

if (!self.nosort)
all = all.sort(self.nocase ? alphasorti : alphasort);
all = all.sort(alphasort);

// at *some* point we statted all of these
if (self.mark) {
@@ -22189,8 +22189,6 @@ function childrenIgnored$2 (self, path) {
}

var common = {
alphasort: alphasort_1,
alphasorti: alphasorti_1,
setopts: setopts_1,
ownProp: ownProp_1,
makeAbs: makeAbs_1,
@@ -22202,6 +22200,11 @@ var common = {

var sync = globSync;
globSync.GlobSync = GlobSync$1;





var setopts$1 = common.setopts;
var ownProp$1 = common.ownProp;
var childrenIgnored$1 = common.childrenIgnored;
@@ -22802,6 +22805,11 @@ function slice (args) {
}

var EE = require$$0__default$1['default'].EventEmitter;





var setopts = common.setopts;
var ownProp = common.ownProp;

@@ -23603,7 +23611,7 @@ var nodeShellExec = cliverse.nodeShellExec;



const BUILD_VERSION = 'Version: 1.0.0 - built on May 7, 2021 10:41:16';
const BUILD_VERSION = 'Version: 1.0.0 - built on May 8, 2021 11:38:39';
function getVersion() { return BUILD_VERSION; }
console.log(getVersion());

@@ -24703,28 +24711,28 @@ var op = {
}
return any(tasks).then(()=>{
return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch})))
return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch, requiresElevation : true})))
// pull or clone target branch
.then( () => any(elevatedRunasRepos.map((repo) => performPullAll({repo}))) )
// switch to source branch
.then( () => {
if(mergesource) return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch: mergesource})))
if(mergesource) return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch: mergesource, requiresElevation : true})))
else return Promise.resolve(true) // Dont do anything if there is no source to merge from.
})
//Pull on merge source branch
.then( () => {
if(!mergesource) return Promise.resolve(true)
return any(elevatedRunasRepos.map((repo) => performPullAll({repo})))
return any(elevatedRunasRepos.map((repo) => performPullAll({repo, requiresElevation : true })))
})
//Switch to target branch
.then( () => {
if(!mergesource) return Promise.resolve(true)
return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch})))
return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch, requiresElevation : true})))
})
.then( //Merge source branch to target branch
() => {
if(!mergesource) return Promise.resolve(true)
return any(elevatedRunasRepos.map((repo) => performMerge({ repo }))).catch(err => { console.error('error in performMerge ' + err); })
return any(elevatedRunasRepos.map((repo) => performMerge({ repo, requiresElevation : true }))).catch(err => { console.error('error in performMerge ' + err); })
})
.then(() => {
fs.writeFileSync('run.done', 'success');

+ 5
- 5
index.js Bestand weergeven

@@ -1140,28 +1140,28 @@ var op = {
}
return any(tasks).then(()=>{
return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch})))
return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch, requiresElevation : true})))
// pull or clone target branch
.then( () => any(elevatedRunasRepos.map((repo) => performPullAll({repo}))) )
// switch to source branch
.then( () => {
if(mergesource) return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch: mergesource})))
if(mergesource) return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch: mergesource, requiresElevation : true})))
else return Promise.resolve(true) // Dont do anything if there is no source to merge from.
})
//Pull on merge source branch
.then( () => {
if(!mergesource) return Promise.resolve(true)
return any(elevatedRunasRepos.map((repo) => performPullAll({repo})))
return any(elevatedRunasRepos.map((repo) => performPullAll({repo, requiresElevation : true })))
})
//Switch to target branch
.then( () => {
if(!mergesource) return Promise.resolve(true)
return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch})))
return any(elevatedRunasRepos.map((repo) => performCheckout({ repo, branch, requiresElevation : true})))
})
.then( //Merge source branch to target branch
() => {
if(!mergesource) return Promise.resolve(true)
return any(elevatedRunasRepos.map((repo) => performMerge({ repo }))).catch(err => { console.error('error in performMerge ' + err) })
return any(elevatedRunasRepos.map((repo) => performMerge({ repo, requiresElevation : true }))).catch(err => { console.error('error in performMerge ' + err) })
})
.then(() => {
fs.writeFileSync('run.done', 'success')

Laden…
Annuleren
Opslaan