From 5337e5cead8d2c92f353c2ebaeb4aa2cdffba42c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Wed, 20 Sep 2023 16:00:09 +0800 Subject: [PATCH] Packages (Linux): fix snap package number detection on systems other than Ubuntu Fixes 562 --- CHANGELOG.md | 1 + src/detection/packages/packages_linux.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 34d0388a1..ab3a8bf77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ Bugfixes: * Fix Termux Monet terminal version detection (Terminal) * Fix zpool volumes detection (Disk, Linux) * Fix external volumes detection (Disk, Linux) +* Fix snap package number detection on systems other than Ubuntu (Packages, Linux) Logo: * Add Afterglow diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c index 7dd4061b4..deca9d86d 100644 --- a/src/detection/packages/packages_linux.c +++ b/src/detection/packages/packages_linux.c @@ -197,6 +197,9 @@ static uint32_t getSnap(FFstrbuf* baseDir) { uint32_t result = getNumElements(baseDir, "/snap", DT_DIR); + if (result == 0) + result = getNumElements(baseDir, "/var/lib/snapd/snap", DT_DIR); + //Accounting for the /snap/bin folder return result > 0 ? result - 1 : 0; }