137 lines
6.5 KiB
Diff
137 lines
6.5 KiB
Diff
diff -ruN a/CMakeLists.txt b/CMakeLists.txt
|
|
--- a/CMakeLists.txt 2026-02-13 10:15:11.000000000 -0600
|
|
+++ b/CMakeLists.txt 2026-02-28 14:34:36.533430812 -0600
|
|
@@ -120,7 +120,7 @@
|
|
message(FATAL_ERROR "BINARY_LINK_TYPE must be one of ${BINARY_LINK_TYPE_OPTIONS}")
|
|
endif()
|
|
|
|
-set(PACKAGE_MANAGERS AM APK BREW CHOCO DPKG EMERGE EOPKG FLATPAK GUIX LINGLONG LPKG LPKGBUILD MACPORTS NIX OPKG PACMAN PACSTALL PALUDIS PISI PKG PKGTOOL RPM SCOOP SNAP SOAR SORCERY WINGET XBPS)
|
|
+set(PACKAGE_MANAGERS AM APK BREW CHOCO DEPOT DPKG EMERGE EOPKG FLATPAK GUIX LINGLONG LPKG LPKGBUILD MACPORTS NIX OPKG PACMAN PACSTALL PALUDIS PISI PKG PKGTOOL RPM SCOOP SNAP SOAR SORCERY WINGET XBPS)
|
|
foreach(package_manager ${PACKAGE_MANAGERS})
|
|
if(package_manager STREQUAL "WINGET")
|
|
option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" ON)
|
|
diff -ruN a/src/detection/packages/packages.h b/src/detection/packages/packages.h
|
|
--- a/src/detection/packages/packages.h 2026-02-13 10:15:11.000000000 -0600
|
|
+++ b/src/detection/packages/packages.h 2026-02-28 14:34:43.270607662 -0600
|
|
@@ -11,6 +11,7 @@
|
|
uint32_t brew;
|
|
uint32_t brewCask;
|
|
uint32_t choco;
|
|
+ uint32_t depot;
|
|
uint32_t dpkg;
|
|
uint32_t emerge;
|
|
uint32_t eopkg;
|
|
diff -ruN a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c
|
|
--- a/src/detection/packages/packages_linux.c 2026-02-13 10:15:11.000000000 -0600
|
|
+++ b/src/detection/packages/packages_linux.c 2026-02-28 14:34:54.446900065 -0600
|
|
@@ -455,6 +455,7 @@
|
|
{
|
|
if (!(options->disabled & FF_PACKAGES_FLAG_APK_BIT)) packageCounts->apk += getNumStrings(baseDir, "/lib/apk/db/installed", "C:Q", "apk");
|
|
if (!(options->disabled & FF_PACKAGES_FLAG_DPKG_BIT)) packageCounts->dpkg += getNumStrings(baseDir, "/var/lib/dpkg/status", "Status: install ok installed", "dpkg");
|
|
+ if (!(options->disabled & FF_PACKAGES_FLAG_DEPOT_BIT)) packageCounts->depot += getSQLite3Int(baseDir, "/var/lib/depot/packages.db", "SELECT COUNT(*) FROM packages", "depot-system");
|
|
if (!(options->disabled & FF_PACKAGES_FLAG_LPKG_BIT)) packageCounts->lpkg += getNumStrings(baseDir, "/opt/Loc-OS-LPKG/installed-lpkg/Listinstalled-lpkg.list", "\n", "lpkg");
|
|
if (!(options->disabled & FF_PACKAGES_FLAG_EMERGE_BIT)) packageCounts->emerge += countFilesRecursive(baseDir, "/var/db/pkg", "SIZE");
|
|
if (!(options->disabled & FF_PACKAGES_FLAG_EOPKG_BIT)) packageCounts->eopkg += getNumElements(baseDir, "/var/lib/eopkg/package", true);
|
|
@@ -559,6 +560,9 @@
|
|
#endif
|
|
|
|
ffStrbufSet(&baseDir, &instance.state.platform.homeDir);
|
|
+ if (!(options->disabled & FF_PACKAGES_FLAG_DEPOT_BIT))
|
|
+ result->depot += getSQLite3Int(&baseDir, ".local/share/depot/packages.db", "SELECT COUNT(*) FROM packages", "depot-user");
|
|
+
|
|
if (!(options->disabled & FF_PACKAGES_FLAG_NIX_BIT))
|
|
{
|
|
// Count packages from $HOME/.nix-profile
|
|
diff -ruN a/src/logo/ascii/vertex.txt b/src/logo/ascii/vertex.txt
|
|
--- a/src/logo/ascii/vertex.txt 1969-12-31 18:00:00.000000000 -0600
|
|
+++ b/src/logo/ascii/vertex.txt 2026-02-28 14:34:29.816254040 -0600
|
|
@@ -0,0 +1,6 @@
|
|
+____ ____ __
|
|
+\ \ / /____________/ |_ ____ ___ ___
|
|
+ \ Y // __ \_ __ \ __\/ __ \\ \/ /
|
|
+ \ /\ ___/| | \/| | \ ___/ > <
|
|
+ \___/ \___ >__| |__| \___ >__/\_ \
|
|
+ \/ \/ \/
|
|
diff -ruN a/src/logo/builtin.c b/src/logo/builtin.c
|
|
--- a/src/logo/builtin.c 2026-02-13 10:15:11.000000000 -0600
|
|
+++ b/src/logo/builtin.c 2026-02-28 14:35:07.169231466 -0600
|
|
@@ -5274,6 +5274,16 @@
|
|
FF_COLOR_FG_BLUE,
|
|
},
|
|
},
|
|
+ // Vertex Linux
|
|
+ {
|
|
+ .names = {"Vertex Linux", "Vertex", "vertex"},
|
|
+ .lines = FASTFETCH_DATATEXT_LOGO_VERTEX,
|
|
+ .colors = {
|
|
+ FF_COLOR_FG_LIGHT_MAGENTA,
|
|
+ },
|
|
+ .colorKeys = FF_COLOR_FG_LIGHT_MAGENTA,
|
|
+ .colorTitle = FF_COLOR_FG_LIGHT_MAGENTA,
|
|
+ },
|
|
// VincentOS
|
|
{
|
|
.names = {"VincentOS"},
|
|
diff -ruN a/src/modules/packages/option.h b/src/modules/packages/option.h
|
|
--- a/src/modules/packages/option.h 2026-02-13 10:15:11.000000000 -0600
|
|
+++ b/src/modules/packages/option.h 2026-02-28 14:34:47.202710674 -0600
|
|
@@ -37,6 +37,7 @@
|
|
FF_PACKAGES_FLAG_PISI_BIT = 1ULL << 29,
|
|
FF_PACKAGES_FLAG_SOAR_BIT = 1ULL << 30,
|
|
FF_PACKAGES_FLAG_KISS_BIT = 1ULL << 31,
|
|
+ FF_PACKAGES_FLAG_DEPOT_BIT = 1ULL << 32,
|
|
FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX,
|
|
} FFPackagesFlags;
|
|
static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), "");
|
|
diff -ruN a/src/modules/packages/packages.c b/src/modules/packages/packages.c
|
|
--- a/src/modules/packages/packages.c 2026-02-13 10:15:11.000000000 -0600
|
|
+++ b/src/modules/packages/packages.c 2026-02-28 14:35:01.426082052 -0600
|
|
@@ -58,6 +58,7 @@
|
|
if((all -= counts.pacman) > 0)
|
|
printf(", ");
|
|
};
|
|
+ FF_PRINT_PACKAGE(depot)
|
|
FF_PRINT_PACKAGE(dpkg)
|
|
FF_PRINT_PACKAGE(rpm)
|
|
FF_PRINT_PACKAGE(emerge)
|
|
@@ -156,6 +157,7 @@
|
|
FF_FORMAT_ARG(counts.all, "all"),
|
|
FF_FORMAT_ARG(counts.pacman, "pacman"),
|
|
FF_FORMAT_ARG(counts.pacmanBranch, "pacman-branch"),
|
|
+ FF_FORMAT_ARG(counts.depot, "depot"),
|
|
FF_FORMAT_ARG(counts.dpkg, "dpkg"),
|
|
FF_FORMAT_ARG(counts.rpm, "rpm"),
|
|
FF_FORMAT_ARG(counts.emerge, "emerge"),
|
|
@@ -255,6 +257,7 @@
|
|
FF_TEST_PACKAGE_NAME(CHOCO)
|
|
break;
|
|
case 'D': if (false);
|
|
+ FF_TEST_PACKAGE_NAME(DEPOT)
|
|
FF_TEST_PACKAGE_NAME(DPKG)
|
|
break;
|
|
case 'E': if (false);
|
|
@@ -345,6 +348,7 @@
|
|
FF_TEST_PACKAGE_NAME(APK)
|
|
FF_TEST_PACKAGE_NAME(BREW)
|
|
FF_TEST_PACKAGE_NAME(CHOCO)
|
|
+ FF_TEST_PACKAGE_NAME(DEPOT)
|
|
FF_TEST_PACKAGE_NAME(DPKG)
|
|
FF_TEST_PACKAGE_NAME(EMERGE)
|
|
FF_TEST_PACKAGE_NAME(EOPKG)
|
|
@@ -402,6 +406,7 @@
|
|
FF_APPEND_PACKAGE_COUNT(brew)
|
|
FF_APPEND_PACKAGE_COUNT(brewCask)
|
|
FF_APPEND_PACKAGE_COUNT(choco)
|
|
+ FF_APPEND_PACKAGE_COUNT(depot)
|
|
FF_APPEND_PACKAGE_COUNT(dpkg)
|
|
FF_APPEND_PACKAGE_COUNT(emerge)
|
|
FF_APPEND_PACKAGE_COUNT(eopkg)
|
|
@@ -466,6 +471,7 @@
|
|
{"Number of all packages", "all"},
|
|
{"Number of pacman packages", "pacman"},
|
|
{"Pacman branch on manjaro", "pacman-branch"},
|
|
+ {"Number of depot packages", "depot"},
|
|
{"Number of dpkg packages", "dpkg"},
|
|
{"Number of rpm packages", "rpm"},
|
|
{"Number of emerge packages", "emerge"},
|