Update 2 files
- /software.yml - /home/dot_local/bin/executable_install-program
This commit is contained in:
parent
51fc60dc28
commit
3a58554808
2 changed files with 70 additions and 166 deletions
|
@ -367,9 +367,9 @@ async function updateInstallMaps(preference, packages, scopedPreference, pkg, pa
|
||||||
if (postHook) {
|
if (postHook) {
|
||||||
installOrdersPost.concat(typeof postHook === 'string' ? [postHook] : postHook)
|
installOrdersPost.concat(typeof postHook === 'string' ? [postHook] : postHook)
|
||||||
}
|
}
|
||||||
const systemdHook = getHook(packages, 'systemd', scopedPreference, preference)
|
const serviceHook = getHook(packages, 'service', scopedPreference, preference)
|
||||||
if (systemdHook) {
|
if (serviceHook) {
|
||||||
installOrdersSystemd.concat(typeof systemdHook === 'string' ? [systemdHook] : systemdHook)
|
installOrdersService.concat(typeof serviceHook === 'string' ? [serviceHook] : serviceHook)
|
||||||
}
|
}
|
||||||
if (!installOrders[preference]) {
|
if (!installOrders[preference]) {
|
||||||
installOrders[preference] = []
|
installOrders[preference] = []
|
||||||
|
@ -1352,11 +1352,11 @@ async function installPackageList(packageManager, packages) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function updateSystemd(service) {
|
async function updateService(service) {
|
||||||
const logStage = 'Systemd Service'
|
const logStage = 'Service Service'
|
||||||
if (osType === 'linux') {
|
if (osType === 'linux') {
|
||||||
const systemd = which.sync('systemctl', { nothrow: true })
|
const systemctl = which.sync('systemctl', { nothrow: true })
|
||||||
if (systemd) {
|
if (systemctl) {
|
||||||
try {
|
try {
|
||||||
log('info', logStage, `Starting / enabling the ${service} service`)
|
log('info', logStage, `Starting / enabling the ${service} service`)
|
||||||
await $`sudo systemctl enable --now ${service}`
|
await $`sudo systemctl enable --now ${service}`
|
||||||
|
@ -1525,8 +1525,8 @@ async function installSoftware(pkgsToInstall) {
|
||||||
await Promise.all(asyncOrders)
|
await Promise.all(asyncOrders)
|
||||||
}
|
}
|
||||||
log('info', 'Post-Install', `Running package-specific post-installation steps`)
|
log('info', 'Post-Install', `Running package-specific post-installation steps`)
|
||||||
for (const service of installOrdersSystemd) {
|
for (const service of installOrdersService) {
|
||||||
await updateSystemd(service)
|
await updateService(service)
|
||||||
}
|
}
|
||||||
for (const script of installOrdersPost) {
|
for (const script of installOrdersPost) {
|
||||||
await $`${script}`
|
await $`${script}`
|
||||||
|
|
218
software.yml
218
software.yml
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue