Skip to content

Commit 0a83423

Browse files
committed
Packages: support eopkg for Solus (#360)
UNTESTED
1 parent 5160644 commit 0a83423

File tree

6 files changed

+13
-6
lines changed

6 files changed

+13
-6
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ AlmaLinux, Alpine, Android, Arch, Arco, Artix, Bedrock, CachyOS, CentOS, CRUX, C
9898

9999
##### Package managers
100100
```
101-
Pacman, dpkg, rpm, emerge, xbps, nix, Flatpak, Snap, apk, pkg, brew, MacPorts, scoop, Chocolatey
101+
Pacman, dpkg, rpm, emerge, eopkg, xbps, nix, Flatpak, Snap, apk, pkg, brew, MacPorts, scoop, Chocolatey
102102
```
103103

104104
##### WM themes

presets/verbose

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--kernel-format Sysname: {}; Release: {}; Version: {}
44
--uptime-format Days: {}; Hours: {}; Minutes: {}; Seconds: {}
55
--processes-format Count: {}
6-
--packages-format All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; xbps: {}; apk: {}; flatpak: {}; snap: {}; brew: {}; brew-cask: {}; port: {}; scoop: {}; choco: {}
6+
--packages-format All: {}; pacman: {}; pacman branch: {}; dpkg: {}; rpm: {}; emerge: {}; eopkg: {}; xbps: {}; apk: {}; flatpak: {}; snap: {}; brew: {}; brew-cask: {}; port: {}; scoop: {}; choco: {}
77
--shell-format Process name: {}; Process path: {}; Process exe: {}; Process version: {}; User path: {}; User exe: {}; User version: {}
88
--resolution-format Width: {}; Height: {}; Refresh rate: {}
99
--de-format Process name: {}; Pretty name: {}; Version: {}

src/detection/packages/packages.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ typedef struct FFPackagesResult
1313
uint32_t choco;
1414
uint32_t dpkg;
1515
uint32_t emerge;
16+
uint32_t eopkg;
1617
uint32_t flatpak;
1718
uint32_t nixDefault;
1819
uint32_t nixSystem;

src/detection/packages/packages_linux.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ static void getPackageCounts(const FFinstance* instance, FFstrbuf* baseDir, FFPa
266266
packageCounts->apk += getNumStrings(baseDir, "/lib/apk/db/installed", "C:Q");
267267
packageCounts->dpkg += getNumStrings(baseDir, "/var/lib/dpkg/status", "Status: ");
268268
packageCounts->emerge += countFilesRecursive(baseDir, "/var/db/pkg", "SIZE");
269+
packageCounts->eopkg += getNumElements(baseDir, "/var/lib/eopkg/package", DT_DIR);
269270
packageCounts->flatpak += getNumElements(baseDir, "/var/lib/flatpak/app", DT_DIR);
270271
packageCounts->nixDefault += getNixPackages(baseDir, "/nix/var/nix/profiles/default");
271272
packageCounts->nixSystem += getNixPackages(baseDir, "/run/current-system");

src/fastfetch.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,14 @@ static inline void printCommandHelp(const char* command)
139139
}
140140
else if(strcasecmp(command, "packages-format") == 0)
141141
{
142-
constructAndPrintCommandHelpFormat("packages", "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (xbps), {8} (nix-system), {9} (nix-user), {10} (nix-default), {11} (apk), {12} (pkg), {13} (flatpak), {14} (snap), {15} (brew), {16} (port), {17} (scoop)", 17,
142+
constructAndPrintCommandHelpFormat("packages", "{2} (pacman){?3}[{3}]{?}, {4} (dpkg), {5} (rpm), {6} (emerge), {7} (eopkg), {8} (xbps), {9} (nix-system), {10} (nix-user), {11} (nix-default), {12} (apk), {13} (pkg), {14} (flatpak), {15} (snap), {16} (brew), {17} (brew-cask), {18} (port), {19} (scoop), {20} (choco)", 20,
143143
"Number of all packages",
144144
"Number of pacman packages",
145145
"Pacman branch on manjaro",
146146
"Number of dpkg packages",
147147
"Number of rpm packages",
148148
"Number of emerge packages",
149+
"Number of eopkg packages",
149150
"Number of xbps packages",
150151
"Number of nix-system packages",
151152
"Number of nix-user packages",
@@ -155,8 +156,10 @@ static inline void printCommandHelp(const char* command)
155156
"Number of flatpak packages",
156157
"Number of snap packages",
157158
"Number of brew packages",
158-
"Number of macports packages"
159-
"Number of scoop packages"
159+
"Number of brew-cask packages",
160+
"Number of macports packages",
161+
"Number of scoop packages",
162+
"Number of choco packages"
160163
);
161164
}
162165
else if(strcasecmp(command, "shell-format") == 0)

src/modules/packages.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "detection/packages/packages.h"
44

55
#define FF_PACKAGES_MODULE_NAME "Packages"
6-
#define FF_PACKAGES_NUM_FORMAT_ARGS 19
6+
#define FF_PACKAGES_NUM_FORMAT_ARGS 20
77

88
void ffPrintPackages(FFinstance* instance)
99
{
@@ -42,6 +42,7 @@ void ffPrintPackages(FFinstance* instance)
4242
FF_PRINT_PACKAGE(dpkg)
4343
FF_PRINT_PACKAGE(rpm)
4444
FF_PRINT_PACKAGE(emerge)
45+
FF_PRINT_PACKAGE(eopkg)
4546
FF_PRINT_PACKAGE(xbps)
4647
FF_PRINT_PACKAGE_NAME(nixSystem, "nix-system")
4748
FF_PRINT_PACKAGE_NAME(nixUser, "nix-user")
@@ -70,6 +71,7 @@ void ffPrintPackages(FFinstance* instance)
7071
{FF_FORMAT_ARG_TYPE_UINT, &counts->dpkg},
7172
{FF_FORMAT_ARG_TYPE_UINT, &counts->rpm},
7273
{FF_FORMAT_ARG_TYPE_UINT, &counts->emerge},
74+
{FF_FORMAT_ARG_TYPE_UINT, &counts->eopkg},
7375
{FF_FORMAT_ARG_TYPE_UINT, &counts->xbps},
7476
{FF_FORMAT_ARG_TYPE_UINT, &counts->nixSystem},
7577
{FF_FORMAT_ARG_TYPE_UINT, &counts->nixUser},

0 commit comments

Comments
 (0)