punkfairie/install.fairie
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update file executable_install-program

Browse source
This commit is contained in:
Brian Zalewski 2023-01-24 14:41:15 +00:00
parent 09e856d560
commit 94cd23929e
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
home/dot_local/bin/executable_install-program
View file

@ -176,6 +176,7 @@ 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) {
@ -184,6 +185,7 @@ async function generateInstallOrders(pkgsToInstall) {
} 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) {
@ -197,6 +199,7 @@ 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) {
@ -204,6 +207,7 @@ async function generateInstallOrders(pkgsToInstall) {
await $(normalCheck) await $(normalCheck)
} 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
} }
} }
@ -237,6 +241,7 @@ async function generateInstallOrders(pkgsToInstall) {
pref = osType + ':' + preference pref = osType + ':' + preference
} }
log('info', 'Filter', `${bin} already in PATH (via _bin:${pref})`) log('info', 'Filter', `${bin} already in PATH (via _bin:${pref})`)
processPluginOrders(pkg)
continue pkgFor continue pkgFor
} else { } else {
if (preference === 'cask' || preference === 'flatpak') { if (preference === 'cask' || preference === 'flatpak') {
@ -251,6 +256,7 @@ async function generateInstallOrders(pkgsToInstall) {
if (bin) { if (bin) {
const pref = preference const pref = preference
log('info', 'Filter', `${bin} already in PATH (via _bin:${pref})`) log('info', 'Filter', `${bin} already in PATH (via _bin:${pref})`)
processPluginOrders(pkg)
continue pkgFor continue pkgFor
} else { } else {
if (preference === 'cask' || preference === 'flatpak') { if (preference === 'cask' || preference === 'flatpak') {
@ -270,6 +276,7 @@ async function generateInstallOrders(pkgsToInstall) {
pref = osType pref = osType
} }
log('info', 'Filter', `${bin} already in PATH (via _bin:${pref})`) log('info', 'Filter', `${bin} already in PATH (via _bin:${pref})`)
processPluginOrders(pkg)
continue pkgFor continue pkgFor
} else { } else {
if (preference === 'cask' || preference === 'flatpak') { if (preference === 'cask' || preference === 'flatpak') {
@ -283,6 +290,7 @@ async function generateInstallOrders(pkgsToInstall) {
: normalCheck.map((x) => which.sync(x, { nothrow: true })).every((y) => !!y) : normalCheck.map((x) => which.sync(x, { nothrow: true })).every((y) => !!y)
if (bin) { if (bin) {
log('info', 'Filter', `${bin} already in PATH (via _bin)`) log('info', 'Filter', `${bin} already in PATH (via _bin)`)
processPluginOrders(pkg)
continue pkgFor continue pkgFor
} else { } else {
if (preference === 'cask' || preference === 'flatpak') { if (preference === 'cask' || preference === 'flatpak') {
@ -383,6 +391,15 @@ async function generateInstallOrders(pkgsToInstall) {
} }
} }
function processPluginOrders(pkg) {
const pluginMap = installData && installData.softwarePlugins && installData.softwarePlugins[pkg]
if (pluginMap) {
if (pluginMap.cmd && pluginMap.plugins) {
installOrdersPlugins.push({ package: pkg, cmd: pluginMap.cmd, plugins: pluginMap.plugins })
}
}
}
// Update install, pre-hook, and post-hook objects // Update install, pre-hook, and post-hook objects
async function updateInstallMaps(preference, packages, scopedPreference, pkg, packageKey, softwarePackages) { async function updateInstallMaps(preference, packages, scopedPreference, pkg, packageKey, softwarePackages) {
const preHook = getHook(packages, 'pre', scopedPreference, preference) const preHook = getHook(packages, 'pre', scopedPreference, preference)
@ -397,12 +414,7 @@ async function updateInstallMaps(preference, packages, scopedPreference, pkg, pa
if (serviceHook) { if (serviceHook) {
installOrdersService.concat(typeof serviceHook === 'string' ? [serviceHook] : serviceHook) installOrdersService.concat(typeof serviceHook === 'string' ? [serviceHook] : serviceHook)
} }
const pluginMap = installData && installData.softwarePlugins && installData.softwarePlugins[pkg] processPluginOrders(pkg)
if (pluginMap) {
if (pluginMap.cmd && pluginMap.plugins) {
installOrdersPlugins.push({ package: pkg, cmd: pluginMap.cmd, plugins: pluginMap.plugins })
}
}
if (!installOrders[preference]) { if (!installOrders[preference]) {
installOrders[preference] = [] installOrders[preference] = []
} }