Update 3 files

- /home/dot_local/bin/executable_install-program
- /home/private_dot_config/shell/aliases.sh.tmpl
- /software.yml
This commit is contained in:
Brian Zalewski 2023-01-05 06:02:52 +00:00
parent 11c8412012
commit 612db32204
3 changed files with 11 additions and 8 deletions

View file

@ -1406,7 +1406,7 @@ async function pruneInstallOrders(installOrders) {
if (pkgManager === 'apt') { if (pkgManager === 'apt') {
newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => { newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
try { try {
runSilentCommand(`dpkg -l ${pkg} | grep -E '^ii' > /dev/null`) await runSilentCommand(`dpkg -l ${pkg} | grep -E '^ii' > /dev/null`)
return false return false
} catch (e) { } catch (e) {
return true return true
@ -1428,9 +1428,9 @@ async function pruneInstallOrders(installOrders) {
newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => { newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
try { try {
if (dnf) { if (dnf) {
runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null > /dev/null`) await runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null > /dev/null`)
} else { } else {
runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null > /dev/null`) await runSilentCommand(`rpm -qa | grep ${pkg} > /dev/null > /dev/null`)
} }
return false return false
} catch (e) { } catch (e) {
@ -1440,7 +1440,7 @@ async function pruneInstallOrders(installOrders) {
} else if (pkgManager === 'flatpak') { } else if (pkgManager === 'flatpak') {
newOrders[pkgManager] = newOrders[pkgManager].filter(async (pkg) => { newOrders[pkgManager] = newOrders[pkgManager].filter(async (pkg) => {
try { try {
runSilentCommand(`flatpak info ${pkg} > /dev/null`) await runSilentCommand(`flatpak info ${pkg} > /dev/null`)
return true return true
} catch (e) { } catch (e) {
return false return false
@ -1449,16 +1449,16 @@ async function pruneInstallOrders(installOrders) {
} else if (pkgManager === 'pacman') { } else if (pkgManager === 'pacman') {
newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => { newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
try { try {
runSilentCommand(`pacman -Qs ${pkg} > /dev/null > /dev/null`) await runSilentCommand(`pacman -Qs ${pkg} > /dev/null > /dev/null`)
return false return false
} catch (e) { } catch (e) {
return true return true
} }
}) })
} else if (pkgManager === 'snap') { } else if (pkgManager === 'snap' || pkgManager === 'snap-classic') {
newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => { newOrders[pkgManager] = await asyncFilter(newOrders[pkgManager], async (pkg) => {
try { try {
runSilentCommand(`snap list ${pkg} | grep ${pkg} > /dev/null`) await runSilentCommand(`snap list ${pkg} | grep ${pkg} > /dev/null`)
return false return false
} catch (e) { } catch (e) {
return true return true

View file

@ -154,6 +154,9 @@ fi
# Convert macOS plist to XML (for source control) # Convert macOS plist to XML (for source control)
alias plist-xml='plutil -convert xml1' alias plist-xml='plutil -convert xml1'
# Recoverpy
alias recoverpy='python3 -m recoverpy'
# Show open ports # Show open ports
alias ports='sudo netstat -tulanp' alias ports='sudo netstat -tulanp'

View file

@ -5540,7 +5540,7 @@ softwarePackages:
_name: RecoverPy _name: RecoverPy
_service: false _service: false
ansible:linux: professormanhattan.recoverpy ansible:linux: professormanhattan.recoverpy
pipx:linux: recoverpy script:linux: python3 -m pip install recoverpy
recoverpy-deps: recoverpy-deps:
apt: apt:
- coreutils - coreutils