From 3aa5ed54d876da280bb05f04db2d85afc77f0eb1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 16 Nov 2016 20:00:07 +1100 Subject: [PATCH] Packages: [Solus] If pisi is unavailable, use eopkg --- neofetch | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 98c147d4..8cc7ae0f 100755 --- a/neofetch +++ b/neofetch @@ -378,14 +378,6 @@ get_packages() { type -p pkginfo >/dev/null && \ packages="$((packages+=$(pkginfo -i | wc -l)))" - type -p pisi >/dev/null && \ - packages="$((packages+=$(pisi list-installed | wc -l)))" - - if type -p pkg >/dev/null; then - packages="$((packages+=$(ls -1 /var/db/pkg | wc -l)))" - (("$packages" == "0")) && packages="$((packages+=$(pkg list | wc -l)))" - fi - type -p emerge >/dev/null && \ packages="$((packages+=$(ls -d /var/db/pkg/*/* | wc -l)))" @@ -406,6 +398,20 @@ get_packages() { type -p cave >/dev/null && \ packages="$((packages+=$(ls -d -1 /var/db/paludis/repositories/cross-installed/*/data/* /var/db/paludis/repositories/installed/data/* | wc -l)))" + + # pisi is sometimes unavailable in Solus(?). This uses eopkg + # instead if pisi isn't found. + if type -p pisi >/dev/null; then + packages="$((packages+=$(pisi list-installed | wc -l)))" + + elif type -p eopkg >/dev/null; then + packages="$((packages+=$(eopkg list-installed | wc -l)))" + fi + + if type -p pkg >/dev/null; then + packages="$((packages+=$(ls -1 /var/db/pkg | wc -l)))" + (("$packages" == "0")) && packages="$((packages+=$(pkg list | wc -l)))" + fi ;; "Mac OS X")