40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
|
--- a/src/modules/packages.c
|
||
|
|
+++ b/src/modules/packages.c
|
||
|
|
@@ -138,12 +138,8 @@
|
||
|
|
|
||
|
|
void ffPrintPackages(FFinstance* instance)
|
||
|
|
{
|
||
|
|
- uint32_t pacman = getNumElements("/var/lib/pacman/local", DT_DIR);
|
||
|
|
- uint32_t dpkg = getNumStrings("/var/lib/dpkg/status", "Status: ");
|
||
|
|
-
|
||
|
|
- #if __ANDROID__
|
||
|
|
- dpkg += getNumStrings("/data/data/com.termux/files/usr/var/lib/dpkg/status", "Status: ");
|
||
|
|
- #endif
|
||
|
|
+ uint32_t pacman = getNumElements("@TERMUX_PREFIX@/var/lib/pacman/local", DT_DIR);
|
||
|
|
+ uint32_t dpkg = getNumStrings("@TERMUX_PREFIX@/var/lib/dpkg/status", "Status: ");
|
||
|
|
|
||
|
|
#ifdef FF_HAVE_RPM
|
||
|
|
uint32_t rpm = getRpmPackageCount(instance);
|
||
|
|
@@ -151,9 +147,9 @@
|
||
|
|
uint32_t rpm = 0;
|
||
|
|
#endif
|
||
|
|
|
||
|
|
- uint32_t emerge = countFilesIn("/var/db/pkg", "SIZE");
|
||
|
|
- uint32_t xbps = getNumElements("/var/db/xbps", DT_REG);
|
||
|
|
- uint32_t flatpak = getNumElements("/var/lib/flatpak/app", DT_DIR);
|
||
|
|
+ uint32_t emerge = countFilesIn("@TERMUX_PREFIX@/var/db/pkg", "SIZE");
|
||
|
|
+ uint32_t xbps = getNumElements("@TERMUX_PREFIX@/var/db/xbps", DT_REG);
|
||
|
|
+ uint32_t flatpak = getNumElements("@TERMUX_PREFIX@/var/lib/flatpak/app", DT_DIR);
|
||
|
|
uint32_t snap = getNumElements("/snap", DT_DIR);
|
||
|
|
|
||
|
|
//Accounting for the /snap/bin folder
|
||
|
|
@@ -170,7 +166,7 @@
|
||
|
|
|
||
|
|
FFstrbuf manjaroBranch;
|
||
|
|
ffStrbufInit(&manjaroBranch);
|
||
|
|
- if(ffParsePropFile("/etc/pacman-mirrors.conf", "Branch =", &manjaroBranch) && manjaroBranch.length == 0)
|
||
|
|
+ if(ffParsePropFile("@TERMUX_PREFIX@/etc/pacman-mirrors.conf", "Branch =", &manjaroBranch) && manjaroBranch.length == 0)
|
||
|
|
ffStrbufSetS(&manjaroBranch, "stable");
|
||
|
|
|
||
|
|
if(instance->config.packagesFormat.length == 0)
|