This commit is contained in:
Brian Zalewski 2023-06-17 19:13:56 +00:00
parent 6a730b1d47
commit 52f5ab17be
2 changed files with 163 additions and 163 deletions

View file

@ -187,8 +187,7 @@ async function generateInstallOrders(pkgsToInstall) {
normalCheck = softwarePackages[packageKey]['_' + currentSelector] normalCheck = softwarePackages[packageKey]['_' + currentSelector]
if (doubleScoped) { if (doubleScoped) {
try { try {
await $doubleScoped await runSilentCommand(doubleScoped)
processPluginOrders(pkg)
} catch (e) { } catch (e) {
let pref let pref
if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osID]) { if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osID]) {
@ -201,21 +200,21 @@ async function generateInstallOrders(pkgsToInstall) {
pref = osType + ':' + preference pref = osType + ':' + preference
} }
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`) log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
processPluginOrders(pkg)
continue pkgFor continue pkgFor
} }
} else if (scopedPkgManager) { } else if (scopedPkgManager) {
try { try {
await $scopedPkgManager await runSilentCommand(scopedPkgManager)
processPluginOrders(pkg)
} catch (e) { } catch (e) {
const pref = preference const pref = preference
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`) log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
processPluginOrders(pkg)
continue pkgFor continue pkgFor
} }
} else if (scopedSystem) { } else if (scopedSystem) {
try { try {
await $scopedSystem await runSilentCommand(scopedSystem)
processPluginOrders(pkg)
} catch (e) { } catch (e) {
let pref let pref
if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID]) { if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID]) {
@ -224,14 +223,15 @@ async function generateInstallOrders(pkgsToInstall) {
pref = osType pref = osType
} }
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`) log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
processPluginOrders(pkg)
continue pkgFor continue pkgFor
} }
} else if (normalCheck) { } else if (normalCheck) {
try { try {
await $normalCheck await runSilentCommand(normalCheck)
processPluginOrders(pkg)
} catch (e) { } catch (e) {
log('info', 'Filter', `${pkg} is being skipped because of the _when condition`) log('info', 'Filter', `${pkg} is being skipped because of the _when condition`)
processPluginOrders(pkg)
continue pkgFor continue pkgFor
} }
} }

File diff suppressed because it is too large Load diff