From bfb7fcd414840524567d3608c6eb579d894d0d7b Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Fri, 6 Jan 2023 04:21:23 +0000 Subject: [PATCH] Update file executable_install-program --- home/dot_local/bin/executable_install-program | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program index 17bafb87..3e708608 100644 --- a/home/dot_local/bin/executable_install-program +++ b/home/dot_local/bin/executable_install-program @@ -281,37 +281,34 @@ async function generateInstallOrders(pkgsToInstall) { if (doubleScoped) { let pref if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osID]) { - pref = preference + ':' + osID + pref = '_deps:' + preference + ':' + osID log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) await generateInstallOrders(softwarePackages[packageKey][pref]) } else if (softwarePackages[packageKey]['_' + currentSelector + ':' + preference + ':' + osType]) { - pref = preference + ':' + osType + pref = '_deps:' + preference + ':' + osType log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) await generateInstallOrders(softwarePackages[packageKey][pref]) } else if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID + ':' + preference]) { - pref = osID + ':' + preference + pref = '_deps:' + osID + ':' + preference log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) await generateInstallOrders(softwarePackages[packageKey][pref]) } else if (softwarePackages[packageKey]['_' + currentSelector + ':' + osType + ':' + preference]) { - pref = osType + ':' + preference + pref = '_deps:' + osType + ':' + preference log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) await generateInstallOrders(softwarePackages[packageKey][pref]) } } else if (scopedPkgManager) { - const pref = preference + const pref = '_deps:' + preference log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) - console.log(packageKey) - console.log(softwarePackages[packageKey]) - console.log(pref) await generateInstallOrders(softwarePackages[packageKey][pref]) } else if (scopedSystem) { let pref if (softwarePackages[packageKey]['_' + currentSelector + ':' + osID]) { - pref = osID + pref = '_deps:' + osID log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) await generateInstallOrders(softwarePackages[packageKey][pref]) } else if (softwarePackages[packageKey]['_' + currentSelector + ':' + osType]) { - pref = osType + pref = '_deps:' + osType log('info', dependenciesTag, `Installing dependencies for ${packageKey}.${pref}`) await generateInstallOrders(softwarePackages[packageKey][pref]) }