From f9f9b94d674f394cf9175eedaec4823f0de4531c Mon Sep 17 00:00:00 2001 From: alexia Date: Mon, 17 Jul 2023 23:53:19 +0200 Subject: [PATCH] Add macOS support (#27) Co-authored-by: Maddie --- README.md | 2 +- src/__main__.py | 5 +++-- src/modules/packages.py | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 38af285..d289676 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Originally forked from [megabytesofrem/pridefetch](https://github.com/megabyteso ## Quickstart -**Requirements:** `Python 3.7` or higher and `python-distro` +**Requirements:** `Python 3.7` or higher, `python-distro` and `python-psutil` ```bash git clone https://github.com/SpyHoodle/pridefetch.git cd pridefetch/src diff --git a/src/__main__.py b/src/__main__.py index 646dc64..8271e0f 100755 --- a/src/__main__.py +++ b/src/__main__.py @@ -14,7 +14,8 @@ from socket import gethostname # System info modules from platform import platform as system from platform import release as kernel -from time import clock_gettime, CLOCK_BOOTTIME +from time import time +from psutil import boot_time from platform import machine as architecture from distro import name as distribution from modules.packages import get_num_packages as packages @@ -45,7 +46,7 @@ stats = { "arch": lambda: architecture() or 'N/A', "pkgs": lambda: packages() or 'N/A', "kernel": lambda: kernel() or system() or 'N/A', - "uptime": lambda: str(timedelta(seconds=clock_gettime(CLOCK_BOOTTIME))).split('.', 1)[0] + "uptime": lambda: str(timedelta(seconds=time() - boot_time())).split('.', 1)[0] } diff --git a/src/modules/packages.py b/src/modules/packages.py index 2cc9552..ad3d944 100644 --- a/src/modules/packages.py +++ b/src/modules/packages.py @@ -12,6 +12,7 @@ class PackagesCommand: packages_commands: list[PackagesCommand] = [ PackagesCommand("pacman -Qq --color never"), # Arch Linux + PackagesCommand("brew list"), # macOS PackagesCommand("dpkg-query -f '.\n' -W"), # Debian, Ubuntu, Mint PackagesCommand("dnf list installed -q", -1), # Fedora, RHEL PackagesCommand("yum list installed -q", -1), # RHEL, Fedora Core, CentOS