diff --git a/home/dot_local/bin/executable_install-program b/home/dot_local/bin/executable_install-program index 4fa2fdf8..ecbf9605 100644 --- a/home/dot_local/bin/executable_install-program +++ b/home/dot_local/bin/executable_install-program @@ -808,6 +808,7 @@ async function beforeInstall(packageManager) { } else if (packageManager === 'pacman') { runCommand('Running pacman update', `sudo pacman -Syu`) } else if (packageManager === 'pipx') { + } else if (packageManager === 'pip') { } else if (packageManager === 'pkg') { await $`sudo pkg upgrade` } else if (packageManager === 'port') { @@ -1441,6 +1442,16 @@ async function installPackageList(packageManager, packages) { } } } + } else if (packageManager === 'pip') { + for (let pkg of packages) { + try { + runCommand(`Installing ${pkg} via ${packageManager}`, `pip3 install ${pkg}`) + log('success', 'Install', `${pkg} successfully installed via ${packageManager}`) + } catch (e) { + log('warn', 'Install', `There was an error installing ${pkg} with pip3`) + console.error(e) + } + } } else if (packageManager === 'pkg-darwin') { for (let pkg of packages) { try { diff --git a/software.yml b/software.yml index da6224f4..f9b7dab8 100644 --- a/software.yml +++ b/software.yml @@ -594,12 +594,12 @@ softwarePackages: _bin: opn-cli _github: https://github.com/andeman/opn-cli _name: OPNSense CLI - pip: opn-cli + pipx: opn-cli pfsense-fauxapi: _bin: fauxapi _github: https://github.com/ndejong/pfsense_fauxapi_client_python _name: pfSense CLI (fauxapi) - pip: pfsense-fauxapi + pipx: pfsense-fauxapi android-commandlinetools: _deps: - java @@ -3219,7 +3219,6 @@ softwarePackages: _name: NFTY _post: | #!/usr/bin/env bash - pipx inject ntfy ntfy[emoji,matrix,pid,slack] sudo mkdir -p /usr/local/etc/branding sudo cp -f "$HOME/.local/etc/branding/logo-color-256x256.png" /usr/local/etc/branding/logo-color-256x256.png sudo mkdir -p /usr/local/share/sounds @@ -3230,7 +3229,7 @@ softwarePackages: if command -v termux-setup-storage > /dev/null; then apt install termux-api fi - pipx: ntfy + pip: ntfy[emoji,matrix,pid,slack] makeself: _bin: makeself _github: https://github.com/megastep/makeself