Packages: Move block

This commit is contained in:
Dylan Araps 2016-11-19 10:34:29 +11:00
parent 98950b4f25
commit 8b0d8dfda2
1 changed files with 6 additions and 6 deletions

View File

@ -399,6 +399,12 @@ get_packages() {
type -p cave >/dev/null && \ 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)))" packages="$((packages+=$(ls -d -1 /var/db/paludis/repositories/cross-installed/*/data/* /var/db/paludis/repositories/installed/data/* | wc -l)))"
type -p lvu >/dev/null && \
packages="$((packages+=$(lvu installed | wc -l)))"
type -p tce-status >/dev/null && \
packages="$((packages+=$(tce-status -i | wc -l)))"
# pisi is sometimes unavailable in Solus(?). This uses eopkg # pisi is sometimes unavailable in Solus(?). This uses eopkg
# instead if pisi isn't found. # instead if pisi isn't found.
if type -p pisi >/dev/null; then if type -p pisi >/dev/null; then
@ -412,12 +418,6 @@ get_packages() {
packages="$((packages+=$(ls -1 /var/db/pkg | wc -l)))" packages="$((packages+=$(ls -1 /var/db/pkg | wc -l)))"
(("$packages" == "0")) && packages="$((packages+=$(pkg list | wc -l)))" (("$packages" == "0")) && packages="$((packages+=$(pkg list | wc -l)))"
fi fi
type -p lvu >/dev/null && \
packages="$((packages+=$(lvu installed | wc -l)))"
type -p tce-status >/dev/null && \
packages="$((packages+=$(tce-status -i | wc -l)))"
;; ;;
"Mac OS X") "Mac OS X")