Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/detection/packages/packages.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ typedef struct FFPackagesResult
uint32_t rpm;
uint32_t scoopUser;
uint32_t scoopGlobal;
uint32_t sdkman;
uint32_t snap;
uint32_t soar;
uint32_t sorcery;
Expand Down
32 changes: 32 additions & 0 deletions src/detection/packages/packages_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,35 @@ static uint32_t getAMUser(void)
return packagesPath.length > 0 ? getAMPackages(&packagesPath) : 0;
}

static uint32_t getSDKMAN(void)
{
const char* candidatesDir = getenv("SDKMAN_CANDIDATES_DIR");
if (!ffStrSet(candidatesDir))
return 0;

FF_AUTO_CLOSE_DIR DIR* dir = opendir(candidatesDir);
if (!dir)
return 0;

uint32_t count = 0;
char path[PATH_MAX];
struct dirent *entry;
while ((entry = readdir(dir)) != NULL)
{
if (entry->d_name[0] == '.')
continue;

if (entry->d_type == DT_DIR || entry->d_type == DT_UNKNOWN)
{
snprintf(path, sizeof(path), "%s/%s/current", candidatesDir, entry->d_name);
if (ffPathExists(path, FF_PATHTYPE_DIRECTORY))
++count;
}
}

return count;
}

static int compareHash(const void* a, const void* b)
{
return memcmp(a, b, 32);
Expand Down Expand Up @@ -556,6 +585,9 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
if (!(options->disabled & FF_PACKAGES_FLAG_AM_BIT))
result->amUser = getAMUser();

if (!(options->disabled & FF_PACKAGES_FLAG_SDKMAN_BIT))
result->sdkman = getSDKMAN();

if (!(options->disabled & FF_PACKAGES_FLAG_SOAR_BIT))
result->soar += getSQLite3Int(&baseDir, ".local/share/soar/db/soar.db", "SELECT COUNT(DISTINCT pkg_id || pkg_name) FROM packages WHERE is_installed = true", "soar");
}
1 change: 1 addition & 0 deletions src/modules/packages/option.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ typedef enum __attribute__((__packed__)) FFPackagesFlags
FF_PACKAGES_FLAG_HPKG_BIT = 1ULL << 28,
FF_PACKAGES_FLAG_PISI_BIT = 1ULL << 29,
FF_PACKAGES_FLAG_SOAR_BIT = 1ULL << 30,
FF_PACKAGES_FLAG_SDKMAN_BIT = 1ULL << 31,
FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX,
} FFPackagesFlags;
static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), "");
Expand Down
6 changes: 6 additions & 0 deletions src/modules/packages/packages.c
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ bool ffPrintPackages(FFPackagesOptions* options)
FF_PRINT_PACKAGE(mport)
FF_PRINT_PACKAGE(pisi)
FF_PRINT_PACKAGE(soar)
FF_PRINT_PACKAGE_NAME(sdkman, "sdk")

putchar('\n');
}
Expand Down Expand Up @@ -194,6 +195,7 @@ bool ffPrintPackages(FFPackagesOptions* options)
FF_FORMAT_ARG(counts.hpkgUser, "hpkg-user"),
FF_FORMAT_ARG(counts.pisi, "pisi"),
FF_FORMAT_ARG(counts.soar, "soar"),
FF_FORMAT_ARG(counts.sdkman, "sdk"),
FF_FORMAT_ARG(nixAll, "nix-all"),
FF_FORMAT_ARG(flatpakAll, "flatpak-all"),
FF_FORMAT_ARG(brewAll, "brew-all"),
Expand Down Expand Up @@ -297,6 +299,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module)
break;
case 'S': if (false);
FF_TEST_PACKAGE_NAME(SCOOP)
FF_TEST_PACKAGE_NAME(SDKMAN)
FF_TEST_PACKAGE_NAME(SNAP)
FF_TEST_PACKAGE_NAME(SOAR)
FF_TEST_PACKAGE_NAME(SORCERY)
Expand Down Expand Up @@ -362,6 +365,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
FF_TEST_PACKAGE_NAME(PKGSRC)
FF_TEST_PACKAGE_NAME(RPM)
FF_TEST_PACKAGE_NAME(SCOOP)
FF_TEST_PACKAGE_NAME(SDKMAN)
FF_TEST_PACKAGE_NAME(SNAP)
FF_TEST_PACKAGE_NAME(SOAR)
FF_TEST_PACKAGE_NAME(SORCERY)
Expand Down Expand Up @@ -423,6 +427,7 @@ bool ffGeneratePackagesJsonResult(FF_MAYBE_UNUSED FFPackagesOptions* options, yy
FF_APPEND_PACKAGE_COUNT(rpm)
FF_APPEND_PACKAGE_COUNT(scoopUser)
FF_APPEND_PACKAGE_COUNT(scoopGlobal)
FF_APPEND_PACKAGE_COUNT(sdkman)
FF_APPEND_PACKAGE_COUNT(snap)
FF_APPEND_PACKAGE_COUNT(soar)
FF_APPEND_PACKAGE_COUNT(sorcery)
Expand Down Expand Up @@ -498,6 +503,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
{"Number of hpkg-user packages", "hpkg-user"},
{"Number of pisi packages", "pisi"},
{"Number of soar packages", "soar"},
{"Number of SDKMAN! SDK packages", "sdk"},
{"Total number of all nix packages", "nix-all"},
{"Total number of all flatpak app packages", "flatpak-all"},
{"Total number of all brew packages", "brew-all"},
Expand Down