This commit is contained in:
Brian Zalewski 2023-06-15 01:49:41 +00:00
parent ac59ffa663
commit 9f82973d58

View file

@ -187,7 +187,7 @@ async function generateInstallOrders(pkgsToInstall) {
normalCheck = softwarePackages[packageKey]['_' + currentSelector]
if (doubleScoped) {
try {
await $doubleScoped
await $` ${doubleScoped}`
} catch (e) {
let pref
if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osID]) {
@ -205,7 +205,7 @@ async function generateInstallOrders(pkgsToInstall) {
}
} else if (scopedPkgManager) {
try {
await $scopedPkgManager
await $` ${scopedPkgManager}`
} catch (e) {
const pref = preference
log('info', 'Filter', `${pkg} is being skipped because of the _when:${pref} condition`)
@ -214,7 +214,7 @@ async function generateInstallOrders(pkgsToInstall) {
}
} else if (scopedSystem) {
try {
await $scopedSystem
await $` ${scopedSystem}`
} catch (e) {
let pref
if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID]) {
@ -228,7 +228,7 @@ async function generateInstallOrders(pkgsToInstall) {
}
} else if (normalCheck) {
try {
await $(normalCheck)
await $` ${normalCheck}`
} catch (e) {
log('info', 'Filter', `${pkg} is being skipped because of the _when condition`)
processPluginOrders(pkg)