From 0f00d67563f810cf992f6e8fbb3c7405ab2dd9ab Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Thu, 2 Feb 2023 03:08:26 +0000
Subject: [PATCH] Update 2 files

- /software.yml
- /home/dot_local/bin/executable_install-program
---
 home/dot_local/bin/executable_install-program | 10 +++++-----
 software.yml                                  |  1 -
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program
index ccbc7f3f..73e5b00c 100644
--- a/home/dot_local/bin/executable_install-program
+++ b/home/dot_local/bin/executable_install-program
@@ -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) {
diff --git a/software.yml b/software.yml
index 2bbb6630..65becbb3 100644
--- a/software.yml
+++ b/software.yml
@@ -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