Update file executable_install-program

This commit is contained in:
Brian Zalewski 2023-01-06 04:21:23 +00:00
parent b439df386f
commit bfb7fcd414

View file

@ -281,37 +281,34 @@ async function generateInstallOrders(pkgsToInstall) {
if (doubleScoped) { if (doubleScoped) {
let pref let pref
if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osID]) { if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osID]) {
pref = preference + ':' + osID pref = '_deps:' + preference + ':' + osID
log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`)
await generateInstallOrders(softwarePackages[packageKey][pref]) await generateInstallOrders(softwarePackages[packageKey][pref])
} else if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osType]) { } else if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osType]) {
pref = preference + ':' + osType pref = '_deps:' + preference + ':' + osType
log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`)
await generateInstallOrders(softwarePackages[packageKey][pref]) await generateInstallOrders(softwarePackages[packageKey][pref])
} else if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID + ':' + preference]) { } else if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID + ':' + preference]) {
pref = osID + ':' + preference pref = '_deps:' + osID + ':' + preference
log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`)
await generateInstallOrders(softwarePackages[packageKey][pref]) await generateInstallOrders(softwarePackages[packageKey][pref])
} else if (softwarePackages[packageKey]['_' + currentSelector + ':' + osType + ':' + preference]) { } else if (softwarePackages[packageKey]['_' + currentSelector + ':' + osType + ':' + preference]) {
pref = osType + ':' + preference pref = '_deps:' + osType + ':' + preference
log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`)
await generateInstallOrders(softwarePackages[packageKey][pref]) await generateInstallOrders(softwarePackages[packageKey][pref])
} }
} else if (scopedPkgManager) { } else if (scopedPkgManager) {
const pref = preference const pref = '_deps:' + preference
log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`)
console.log(packageKey)
console.log(softwarePackages[packageKey])
console.log(pref)
await generateInstallOrders(softwarePackages[packageKey][pref]) await generateInstallOrders(softwarePackages[packageKey][pref])
} else if (scopedSystem) { } else if (scopedSystem) {
let pref let pref
if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID]) { if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID]) {
pref = osID pref = '_deps:' + osID
log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`)
await generateInstallOrders(softwarePackages[packageKey][pref]) await generateInstallOrders(softwarePackages[packageKey][pref])
} else if (softwarePackages[packageKey]['_' + currentSelector + ':' + osType]) { } else if (softwarePackages[packageKey]['_' + currentSelector + ':' + osType]) {
pref = osType pref = '_deps:' + osType
log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`)
await generateInstallOrders(softwarePackages[packageKey][pref]) await generateInstallOrders(softwarePackages[packageKey][pref])
} }