Skip to content

feat: add SDKMAN! package count support #2340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gathddu wants to merge 1 commit into from
+40 −1
Closed

feat: add SDKMAN! package count support #2340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ typedef struct FFPackagesResult {
uint32_t rpm;
uint32_t scoopGlobal;
uint32_t scoopUser;
uint32_t sdkman;
uint32_t snap;
uint32_t soar;
uint32_t sorcery;
Expand Down
35 changes: 34 additions & 1 deletion src/detection/packages/packages_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,7 +431,7 @@ static uint32_t getPacmanPackages(FFstrbuf* baseDir) {
uint32_t baseDirLen = baseDir->length;
ffStrbufAppendS(baseDir, "/etc/pacman.conf");

bool confFound = ffParsePropFileValues(baseDir->chars, 2, (FFpropquery[]) {
bool confFound = ffParsePropFileValues(baseDir->chars, 2, (FFpropquery[]){
{ "DBPath =", &dbPath },
{ "RootDir =", &rootDir },
});
Expand Down Expand Up @@ -648,4 +648,37 @@ void ffDetectPackagesImpl(FFPackagesResult* result, FFPackagesOptions* options)
result->appimage += getNumElementsBySuffix(&baseDir, "/AppImages", ".appimage");
result->appimage += getNumElementsBySuffix(&baseDir, "/Applications", ".appimage");
}
if (!(options->disabled & FF_PACKAGES_FLAG_SDKMAN_BIT)) {
const char* sdkmanDir = getenv("SDKMAN_CANDIDATES_DIR");
if (sdkmanDir != NULL && sdkmanDir[0] != '\0') {
DIR* dir = opendir(sdkmanDir);
if (dir != NULL) {
struct dirent* entry;
while ((entry = readdir(dir)) != NULL) {
if (entry->d_name[0] == '.') {
continue;
}

char path[512];
snprintf(path, sizeof(path), "%s/%s", sdkmanDir, entry->d_name);
DIR* subdir = opendir(path);
if (subdir != NULL) {
bool hasContent = false;
struct dirent* subentry;
while ((subentry = readdir(subdir)) != NULL) {
if (subentry->d_name[0] != '.') {
hasContent = true;
break;
}
}
closedir(subdir);
if (hasContent) {
result->sdkman++;
}
}
}
closedir(dir);
}
}
}
}
1 change: 1 addition & 0 deletions src/modules/packages/option.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ typedef enum FF_A_PACKED FFPackagesFlags {
FF_PACKAGES_FLAG_MOSS_BIT = 1ULL << 32,
FF_PACKAGES_FLAG_APPIMAGE_BIT = 1ULL << 33,
FF_PACKAGES_FLAG_CARDS_BIT = 1ULL << 34,
FF_PACKAGES_FLAG_SDKMAN_BIT = 1ULL << 35,
FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX,
} FFPackagesFlags;
static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), "");
Expand Down
4 changes: 4 additions & 0 deletions src/modules/packages/packages.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ bool ffPrintPackages(FFPackagesOptions* options) {
} else {
FF_PRINT_PACKAGE_NAME(scoopUser, "scoop")
}
FF_PRINT_PACKAGE_NAME(sdkman, "sdk")
FF_PRINT_PACKAGE(snap)
FF_PRINT_PACKAGE(soar)
FF_PRINT_PACKAGE(sorcery)
Expand Down Expand Up @@ -190,6 +191,7 @@ bool ffPrintPackages(FFPackagesOptions* options) {
FF_ARG(counts.rpm, "rpm"),
FF_ARG(counts.scoopGlobal, "scoop-global"),
FF_ARG(counts.scoopUser, "scoop-user"),
FF_ARG(counts.sdkman, "sdkman"),
FF_ARG(counts.snap, "snap"),
FF_ARG(counts.soar, "soar"),
FF_ARG(counts.sorcery, "sorcery"),
Expand Down Expand Up @@ -327,6 +329,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) {
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 @@ -466,6 +469,7 @@ bool ffGeneratePackagesJsonResult(FF_A_UNUSED FFPackagesOptions* options, yyjson
FF_APPEND_PACKAGE_COUNT(rpm)
FF_APPEND_PACKAGE_COUNT(scoopGlobal)
FF_APPEND_PACKAGE_COUNT(scoopUser)
FF_APPEND_PACKAGE_COUNT(sdkman)
FF_APPEND_PACKAGE_COUNT(snap)
FF_APPEND_PACKAGE_COUNT(soar)
FF_APPEND_PACKAGE_COUNT(sorcery)
Expand Down