Update package version to 2.63.1

This commit is contained in:
2026-05-17 16:18:32 +03:00
parent 36c1704b88
commit 1c624413ce
2 changed files with 27 additions and 27 deletions
+25 -25
View File
@@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c6c8bdb..42af4cc0 100644
index ee9f5826..206c3caf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -119,7 +119,7 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS)
@@ -120,7 +120,7 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS)
message(FATAL_ERROR "BINARY_LINK_TYPE must be one of ${BINARY_LINK_TYPE_OPTIONS}")
endif()
@@ -12,20 +12,20 @@ index 2c6c8bdb..42af4cc0 100644
if(package_manager STREQUAL "WINGET")
option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" ON)
diff --git a/doc/json_schema.json b/doc/json_schema.json
index 8d1d168b..73b7b8dd 100644
index f8198587..264d5e40 100644
--- a/doc/json_schema.json
+++ b/doc/json_schema.json
@@ -442,7 +442,7 @@
"type": "string"
},
"packagesFormat": {
- "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop-user}: Number of scoop-user packages\n 21. {scoop-global}: Number of scoop-global packages\n 22. {choco}: Number of choco packages\n 23. {pkgtool}: Number of pkgtool packages\n 24. {paludis}: Number of paludis packages\n 25. {winget}: Number of winget packages\n 26. {opkg}: Number of opkg packages\n 27. {am-system}: Number of am-system packages\n 28. {sorcery}: Number of sorcery packages\n 29. {lpkg}: Number of lpkg packages\n 30. {lpkgbuild}: Number of lpkgbuild packages\n 31. {guix-system}: Number of guix-system packages\n 32. {guix-user}: Number of guix-user packages\n 33. {guix-home}: Number of guix-home packages\n 34. {linglong}: Number of linglong packages\n 35. {pacstall}: Number of pacstall packages\n 36. {mport}: Number of mport packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {kiss}: Number of kiss packages\n 44. {moss}: Number of moss packages\n 45. {nix-all}: Total number of all nix packages\n 46. {flatpak-all}: Total number of all flatpak app packages\n 47. {brew-all}: Total number of all brew packages\n 48. {guix-all}: Total number of all guix packages\n 49. {hpkg-all}: Total number of all hpkg packages",
+ "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {pacman}: Number of pacman packages\n 3. {pacman-branch}: Pacman branch on manjaro\n 4. {dpkg}: Number of dpkg packages\n 5. {rpm}: Number of rpm packages\n 6. {emerge}: Number of emerge packages\n 7. {eopkg}: Number of eopkg packages\n 8. {xbps}: Number of xbps packages\n 9. {nix-system}: Number of nix-system packages\n 10. {nix-user}: Number of nix-user packages\n 11. {nix-default}: Number of nix-default packages\n 12. {apk}: Number of apk packages\n 13. {pkg}: Number of pkg packages\n 14. {flatpak-system}: Number of flatpak-system app packages\n 15. {flatpak-user}: Number of flatpak-user app packages\n 16. {snap}: Number of snap packages\n 17. {brew}: Number of brew packages\n 18. {brew-cask}: Number of brew-cask packages\n 19. {macports}: Number of macports packages\n 20. {scoop-user}: Number of scoop-user packages\n 21. {scoop-global}: Number of scoop-global packages\n 22. {choco}: Number of choco packages\n 23. {pkgtool}: Number of pkgtool packages\n 24. {paludis}: Number of paludis packages\n 25. {winget}: Number of winget packages\n 26. {opkg}: Number of opkg packages\n 27. {am-system}: Number of am-system packages\n 28. {sorcery}: Number of sorcery packages\n 29. {lpkg}: Number of lpkg packages\n 30. {lpkgbuild}: Number of lpkgbuild packages\n 31. {guix-system}: Number of guix-system packages\n 32. {guix-user}: Number of guix-user packages\n 33. {guix-home}: Number of guix-home packages\n 34. {linglong}: Number of linglong packages\n 35. {pacstall}: Number of pacstall packages\n 36. {mport}: Number of mport packages\n 37. {am-user}: Number of am-user (aka appman) packages\n 38. {pkgsrc}: Number of pkgsrc packages\n 39. {hpkg-system}: Number of hpkg-system packages\n 40. {hpkg-user}: Number of hpkg-user packages\n 41. {pisi}: Number of pisi packages\n 42. {soar}: Number of soar packages\n 43. {kiss}: Number of kiss packages\n 44. {moss}: Number of moss packages\n 45. {bpm}: Total number of all bpm packages\n 46. {nix-all}: Total number of all nix packages\n 47. {flatpak-all}: Total number of all flatpak app packages\n 48. {brew-all}: Total number of all brew packages\n 49. {guix-all}: Total number of all guix packages\n 50. {hpkg-all}: Total number of all hpkg packages",
- "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {am-system}: Number of am-system packages\n 3. {am-user}: Number of am-user (aka appman) packages\n 4. {appimage}: Number of appimage packages\n 5. {apk}: Number of apk packages\n 6. {brew}: Number of brew packages\n 7. {brew-all}: Total number of all brew packages\n 8. {brew-cask}: Number of brew-cask packages\n 9. {cards}: Number of cards packages\n 10. {choco}: Number of choco packages\n 11. {dpkg}: Number of dpkg packages\n 12. {emerge}: Number of emerge packages\n 13. {eopkg}: Number of eopkg packages\n 14. {flatpak-all}: Total number of all flatpak app packages\n 15. {flatpak-system}: Number of flatpak-system app packages\n 16. {flatpak-user}: Number of flatpak-user app packages\n 17. {guix-all}: Total number of all guix packages\n 18. {guix-home}: Number of guix-home packages\n 19. {guix-system}: Number of guix-system packages\n 20. {guix-user}: Number of guix-user packages\n 21. {hpkg-all}: Total number of all hpkg packages\n 22. {hpkg-system}: Number of hpkg-system packages\n 23. {hpkg-user}: Number of hpkg-user packages\n 24. {kiss}: Number of kiss packages\n 25. {linglong}: Number of linglong packages\n 26. {lpkg}: Number of lpkg packages\n 27. {lpkgbuild}: Number of lpkgbuild packages\n 28. {macports}: Number of macports packages\n 29. {mport}: Number of mport packages\n 30. {moss}: Number of moss packages\n 31. {nix-all}: Total number of all nix packages\n 32. {nix-default}: Number of nix-default packages\n 33. {nix-system}: Number of nix-system packages\n 34. {nix-user}: Number of nix-user packages\n 35. {opkg}: Number of opkg packages\n 36. {pacman}: Number of pacman packages\n 37. {pacman-branch}: Pacman branch on manjaro\n 38. {pacstall}: Number of pacstall packages\n 39. {paludis}: Number of paludis packages\n 40. {pisi}: Number of pisi packages\n 41. {pkg}: Number of pkg packages\n 42. {pkgsrc}: Number of pkgsrc packages\n 43. {pkgtool}: Number of pkgtool packages\n 44. {rpm}: Number of rpm packages\n 45. {scoop-global}: Number of scoop-global packages\n 46. {scoop-user}: Number of scoop-user packages\n 47. {snap}: Number of snap packages\n 48. {soar}: Number of soar packages\n 49. {sorcery}: Number of sorcery packages\n 50. {winget}: Number of winget packages\n 51. {xbps}: Number of xbps packages",
+ "description": "Output format for the `Packages` module. See Wiki for formatting syntax\n 1. {all}: Number of all packages\n 2. {am-system}: Number of am-system packages\n 3. {am-user}: Number of am-user (aka appman) packages\n 4. {appimage}: Number of appimage packages\n 5. {apk}: Number of apk packages\n 6. {bpm}: Total number of all bpm packages\n 7. {brew}: Number of brew packages\n 8. {brew-all}: Total number of all brew packages\n 9. {brew-cask}: Number of brew-cask packages\n 10. {cards}: Number of cards packages\n 11. {choco}: Number of choco packages\n 12. {dpkg}: Number of dpkg packages\n 13. {emerge}: Number of emerge packages\n 14. {eopkg}: Number of eopkg packages\n 15. {flatpak-all}: Total number of all flatpak app packages\n 16. {flatpak-system}: Number of flatpak-system app packages\n 17. {flatpak-user}: Number of flatpak-user app packages\n 18. {guix-all}: Total number of all guix packages\n 19. {guix-home}: Number of guix-home packages\n 20. {guix-system}: Number of guix-system packages\n 21. {guix-user}: Number of guix-user packages\n 22. {hpkg-all}: Total number of all hpkg packages\n 23. {hpkg-system}: Number of hpkg-system packages\n 24. {hpkg-user}: Number of hpkg-user packages\n 25. {kiss}: Number of kiss packages\n 26. {linglong}: Number of linglong packages\n 27. {lpkg}: Number of lpkg packages\n 28. {lpkgbuild}: Number of lpkgbuild packages\n 29. {macports}: Number of macports packages\n 30. {mport}: Number of mport packages\n 31. {moss}: Number of moss packages\n 32. {nix-all}: Total number of all nix packages\n 33. {nix-default}: Number of nix-default packages\n 34. {nix-system}: Number of nix-system packages\n 35. {nix-user}: Number of nix-user packages\n 36. {opkg}: Number of opkg packages\n 37. {pacman}: Number of pacman packages\n 38. {pacman-branch}: Pacman branch on manjaro\n 39. {pacstall}: Number of pacstall packages\n 40. {paludis}: Number of paludis packages\n 41. {pisi}: Number of pisi packages\n 42. {pkg}: Number of pkg packages\n 43. {pkgsrc}: Number of pkgsrc packages\n 44. {pkgtool}: Number of pkgtool packages\n 45. {rpm}: Number of rpm packages\n 46. {scoop-global}: Number of scoop-global packages\n 47. {scoop-user}: Number of scoop-user packages\n 48. {snap}: Number of snap packages\n 49. {soar}: Number of soar packages\n 50. {sorcery}: Number of sorcery packages\n 51. {winget}: Number of winget packages\n 52. {xbps}: Number of xbps packages",
"type": "string"
},
"physicaldiskFormat": {
diff --git a/src/detection/packages/packages.h b/src/detection/packages/packages.h
index d92bfce1..10d6ab53 100644
index 0a2c4040..21dd279a 100644
--- a/src/detection/packages/packages.h
+++ b/src/detection/packages/packages.h
@@ -8,6 +8,7 @@ typedef struct FFPackagesResult {
@@ -35,14 +35,14 @@ index d92bfce1..10d6ab53 100644
+ uint32_t bpm;
uint32_t brew;
uint32_t brewCask;
uint32_t choco;
uint32_t cards;
diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c
index 042557d0..1bdbf0b9 100644
index 98a01b23..41ad97fb 100644
--- a/src/detection/packages/packages_linux.c
+++ b/src/detection/packages/packages_linux.c
@@ -537,6 +537,9 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
if (!(options->disabled & FF_PACKAGES_FLAG_MOSS_BIT)) {
packageCounts->moss += getSQLite3Int(baseDir, "/.moss/db/state", "SELECT COUNT(*) FROM state_selections WHERE state_id = (SELECT MAX(id) FROM state)", "moss");
@@ -540,6 +540,9 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
if (!(options->disabled & FF_PACKAGES_FLAG_CARDS_BIT)) {
packageCounts->cards += getNumElements(baseDir, "/var/lib/pkg/DB", true);
}
+ if (!(options->disabled & FF_PACKAGES_FLAG_BPM_BIT)) {
+ packageCounts->bpm += getNumElements(baseDir, "/var/lib/bpm/installed", true);
@@ -71,10 +71,10 @@ index 00000000..2d8b44e3
+ $2*$1@@$2~~ $2~$1@@@@$2~~~
+ $2~~ $2~~~~
diff --git a/src/logo/builtin.c b/src/logo/builtin.c
index 0cd83efe..7b02c409 100644
index 1775a627..67406106 100644
--- a/src/logo/builtin.c
+++ b/src/logo/builtin.c
@@ -4853,6 +4853,17 @@ static const FFlogo T[] = {
@@ -4992,6 +4992,17 @@ static const FFlogo T[] = {
FF_COLOR_FG_GREEN,
},
},
@@ -93,19 +93,19 @@ index 0cd83efe..7b02c409 100644
{
.names = { "Torizon OS", "TorizonCore" },
diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h
index cac1f35f..2181defd 100644
index 60184943..0b68d0d0 100644
--- a/src/modules/packages/option.h
+++ b/src/modules/packages/option.h
@@ -38,6 +38,7 @@ typedef enum FF_A_PACKED FFPackagesFlags {
FF_PACKAGES_FLAG_KISS_BIT = 1ULL << 31,
@@ -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_BPM_BIT = 1ULL << 34,
FF_PACKAGES_FLAG_CARDS_BIT = 1ULL << 34,
+ FF_PACKAGES_FLAG_BPM_BIT = 1ULL << 35,
FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX,
} FFPackagesFlags;
static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), "");
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
index 2120b7dc..4b01f1a1 100644
index a0012047..424ed43e 100644
--- a/src/modules/packages/packages.c
+++ b/src/modules/packages/packages.c
@@ -55,6 +55,7 @@ bool ffPrintPackages(FFPackagesOptions* options) {
@@ -116,7 +116,7 @@ index 2120b7dc..4b01f1a1 100644
if (options->combined) {
FF_PRINT_PACKAGE_ALL(brew);
} else {
@@ -148,6 +149,7 @@ bool ffPrintPackages(FFPackagesOptions* options) {
@@ -149,6 +150,7 @@ bool ffPrintPackages(FFPackagesOptions* options) {
FF_ARG(counts.amUser, "am-user"),
FF_ARG(counts.appimage, "appimage"),
FF_ARG(counts.apk, "apk"),
@@ -124,7 +124,7 @@ index 2120b7dc..4b01f1a1 100644
FF_ARG(counts.brew, "brew"),
FF_ARG(brewAll, "brew-all"),
FF_ARG(counts.brewCask, "brew-cask"),
@@ -243,6 +245,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) {
@@ -245,6 +247,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) {
if (false)
;
FF_TEST_PACKAGE_NAME(BREW)
@@ -132,23 +132,23 @@ index 2120b7dc..4b01f1a1 100644
break;
case 'C':
if (false)
@@ -370,6 +373,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
@@ -373,6 +376,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
FF_TEST_PACKAGE_NAME(AM)
FF_TEST_PACKAGE_NAME(APK)
FF_TEST_PACKAGE_NAME(APPIMAGE)
+ FF_TEST_PACKAGE_NAME(BPM)
FF_TEST_PACKAGE_NAME(BREW)
FF_TEST_PACKAGE_NAME(CARDS)
FF_TEST_PACKAGE_NAME(CHOCO)
FF_TEST_PACKAGE_NAME(DPKG)
@@ -427,6 +431,7 @@ bool ffGeneratePackagesJsonResult(FF_A_UNUSED FFPackagesOptions* options, yyjson
@@ -431,6 +435,7 @@ bool ffGeneratePackagesJsonResult(FF_A_UNUSED FFPackagesOptions* options, yyjson
FF_APPEND_PACKAGE_COUNT(amUser)
FF_APPEND_PACKAGE_COUNT(appimage)
FF_APPEND_PACKAGE_COUNT(apk)
+ FF_APPEND_PACKAGE_COUNT(bpm)
FF_APPEND_PACKAGE_COUNT(brew)
FF_APPEND_PACKAGE_COUNT(brewCask)
FF_APPEND_PACKAGE_COUNT(choco)
@@ -523,6 +528,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
FF_APPEND_PACKAGE_COUNT(cards)
@@ -529,6 +534,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
{ "Number of macports packages", "macports" },
{ "Number of mport packages", "mport" },
{ "Number of moss packages", "moss" },