From 612db322047cc7ef4ead019f280195ccbad5682b Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Thu, 5 Jan 2023 06:02:52 +0000
Subject: [PATCH] Update 3 files

- /home/dot_local/bin/executable_install-program
- /home/private_dot_config/shell/aliases.sh.tmpl
- /software.yml
---
 home/dot_local/bin/executable_install-program | 14 +++++++-------
 home/private_dot_config/shell/aliases.sh.tmpl |  3 +++
 software.yml                                  |  2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program
index 41075d68..788bab5f 100644
--- a/home/dot_local/bin/executable_install-program
+++ b/home/dot_local/bin/executable_install-program
@@ -1406,7 +1406,7 @@ async function pruneInstallOrders(installOrders) {
     if (pkgManager === 'apt') {
       newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
         try {
-          runSilentCommand(`dpkg -l ${pkg} | grep -E '^ii' > /dev/null`)
+          await runSilentCommand(`dpkg -l ${pkg} | grep -E '^ii' > /dev/null`)
           return false
         } catch (e) {
           return true
@@ -1428,9 +1428,9 @@ async function pruneInstallOrders(installOrders) {
       newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
         try {
           if (dnf) {
-            runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null > /dev/null`)
+            await runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null > /dev/null`)
           } else {
-            runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null > /dev/null`)
+            await runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null > /dev/null`)
           }
           return false
         } catch (e) {
@@ -1440,7 +1440,7 @@ async function pruneInstallOrders(installOrders) {
     } else if (pkgManager === 'flatpak') {
       newOrders[pkgManager] = newOrders[pkgManager].filter(async (pkg) => {
         try {
-          runSilentCommand(`flatpak info ${pkg} > /dev/null`)
+          await runSilentCommand(`flatpak info ${pkg} > /dev/null`)
           return true
         } catch (e) {
           return false
@@ -1449,16 +1449,16 @@ async function pruneInstallOrders(installOrders) {
     } else if (pkgManager === 'pacman') {
       newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
         try {
-          runSilentCommand(`pacman -Qs ${pkg} > /dev/null > /dev/null`)
+          await runSilentCommand(`pacman -Qs ${pkg} > /dev/null > /dev/null`)
           return false
         } catch (e) {
           return true
         }
       })
-    } else if (pkgManager === 'snap') {
+    } else if (pkgManager === 'snap' || pkgManager === 'snap-classic') {
       newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
         try {
-          runSilentCommand(`snap list ${pkg} | grep ${pkg} > /dev/null`)
+          await runSilentCommand(`snap list ${pkg} | grep ${pkg} > /dev/null`)
           return false
         } catch (e) {
           return true
diff --git a/home/private_dot_config/shell/aliases.sh.tmpl b/home/private_dot_config/shell/aliases.sh.tmpl
index a7a9e4d4..a1eb6c10 100644
--- a/home/private_dot_config/shell/aliases.sh.tmpl
+++ b/home/private_dot_config/shell/aliases.sh.tmpl
@@ -154,6 +154,9 @@ fi
 # Convert macOS plist to XML (for source control)
 alias plist-xml='plutil -convert xml1'
 
+# Recoverpy
+alias recoverpy='python3 -m recoverpy'
+
 # Show open ports
 alias ports='sudo netstat -tulanp'
 
diff --git a/software.yml b/software.yml
index 3f0d2d03..1cc23624 100644
--- a/software.yml
+++ b/software.yml
@@ -5540,7 +5540,7 @@ softwarePackages:
     _name: RecoverPy
     _service: false
     ansible:linux: professormanhattan.recoverpy
-    pipx:linux: recoverpy
+    script:linux: python3 -m pip install recoverpy
   recoverpy-deps:
     apt:
       - coreutils