Update 2 files

- /software.yml
- /home/dot_local/bin/executable_install-program
This commit is contained in:
Brian Zalewski 2023-02-02 03:08:26 +00:00
parent f79af8f76b
commit 0f00d67563
2 changed files with 5 additions and 6 deletions

View file

@ -642,7 +642,7 @@ async function ensurePackage(dep) {
}
try {
log('info', 'dnf Installation', `Checking if ${dep} is already installed`)
await $`rpm -qa | grep ${dep} > /dev/null`
await $`rpm -qa | grep '$'"${dep}-" > /dev/null`
} catch (e) {
log('info', 'dnf Installation', `Installing ${dep} since it is not already present on the system`)
await $`sudo dnf install -y ${dep}`
@ -653,7 +653,7 @@ async function ensurePackage(dep) {
}
try {
log('info', 'YUM Installation', `Checking if ${dep} is already installed`)
await $`rpm -qa | grep ${dep} > /dev/null`
await $`rpm -qa | grep '$'"${dep}-" > /dev/null`
} catch (e) {
log('info', 'YUM Installation', `Installing ${dep} since it is not already present on the system`)
await $`sudo yum install -y ${dep}`
@ -675,7 +675,7 @@ async function ensurePackage(dep) {
}
try {
log('info', 'Zypper Installation', `Checking if ${dep} is already installed`)
await $`rpm -qa | grep ${dep} > /dev/null`
await $`rpm -qa | grep '$'"${dep}-" > /dev/null`
} catch (e) {
log('info', 'Zypper Installation', `Installing ${dep} since it is not already present on the system`)
await $`sudo zypper install -y ${dep}`
@ -1603,9 +1603,9 @@ async function pruneInstallOrders(installOrders) {
newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
try {
if (dnf) {
await runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null`)
await runSilentCommand(`rpm -qa | grep '$'"${pkg}-" > /dev/null`)
} else {
await runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null`)
await runSilentCommand(`rpm -qa | grep '$'"${pkg}-" > /dev/null`)
}
return false
} catch (e) {

View file

@ -5581,7 +5581,6 @@ softwarePackages:
dnf: pass
pacman: pass
pkg: password-store
_service: false
pastel:
_bin: pastel
_desc: A command-line tool to generate, analyze, convert and manipulate colors