From 7c8ea39b59d7a1744be42e7c704745bac2a515e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AB=8F=E8=A8=AA=E5=AD=90?= Date: Thu, 18 Jul 2024 16:09:05 +0900 Subject: [PATCH] =?UTF-8?q?Linux:=20pacman=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 1 + src/packages.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6b4a1c..b668f60 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Linux: 「/proc/cpuinfo」で使ってCPU速さの受け取る様に * Kubuntu、Xubuntu、Lubuntu、Arco、Hyperbola、Parabola、Pop OSロゴの追加 * Linux: 「hostname」コマンドがなければ、「cat /etc/hostname」を実効する様に +* Linux: pacman対応 # 0.2.0 * Manjaroのロゴの追加 diff --git a/src/packages.c b/src/packages.c index 4556425..e2982b4 100644 --- a/src/packages.c +++ b/src/packages.c @@ -20,11 +20,14 @@ const char *display_packages() { return run_command_s("pkg list | wc -l | sed 's/ *//' && echo \" (pkg list)\""); #elif defined(__linux__) if (access("/bin/xbps-query", F_OK) != -1) { - return run_command_s("xbps-query -l | wc -l | sed \"s/ //g\" " - "&& echo \" (xbps-query)\""); + return run_command_s("xbps-query -l | wc -l | sed \"s/ //g\" && " + "echo \" (xbps-query)\""); } else if (access("/usr/bin/dpkg-query", F_OK) != -1) { return run_command_s("dpkg-query -f '.\n' -W | wc -l | sed \"s/ //g\" && " "echo \" (dpkg-query)\""); + } else if (access("/usr/bin/pacman", F_OK) != -1) { + return run_command_s("pacman -Qq | wc -l | sed \"s/ //g\" && " + "echo \" (pacman)\""); } return NULL;