Update package version to 2.64.2
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
name: fastfetch
|
name: fastfetch
|
||||||
description: A maintained, feature-rich and performance oriented, neofetch like system information tool
|
description: A maintained, feature-rich and performance oriented, neofetch like system information tool
|
||||||
version: 2.63.1
|
version: 2.64.2
|
||||||
revision: 2
|
revision: 1
|
||||||
url: https://github.com/fastfetch-cli/fastfetch
|
url: https://github.com/fastfetch-cli/fastfetch
|
||||||
license: MIT
|
license: MIT
|
||||||
maintainers:
|
maintainers:
|
||||||
@@ -47,4 +47,4 @@ downloads:
|
|||||||
- url: https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz
|
- url: https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${BPM_PKG_VERSION}.tar.gz
|
||||||
extract_to: ${BPM_SOURCE}
|
extract_to: ${BPM_SOURCE}
|
||||||
extract_strip_components: 1
|
extract_strip_components: 1
|
||||||
checksum: 6e124699ea20fb02c5bc402c0012543303ee75ca55ad664f96bc6cd414d7e6b3
|
checksum: 28db81d6568f28281d9aab9e88d5a4c7892d519c54b8739eef17953cce6802d0
|
||||||
|
|||||||
@@ -1,21 +1,21 @@
|
|||||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||||
index ee9f5826..206c3caf 100644
|
index 2323569b..b105c3f3 100644
|
||||||
--- a/CMakeLists.txt
|
--- a/CMakeLists.txt
|
||||||
+++ b/CMakeLists.txt
|
+++ b/CMakeLists.txt
|
||||||
@@ -120,7 +120,7 @@ if(NOT BINARY_LINK_TYPE IN_LIST BINARY_LINK_TYPE_OPTIONS)
|
@@ -136,7 +136,7 @@ endif()
|
||||||
message(FATAL_ERROR "BINARY_LINK_TYPE must be one of ${BINARY_LINK_TYPE_OPTIONS}")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
-set(PACKAGE_MANAGERS AM APPIMAGE 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
|
||||||
+set(PACKAGE_MANAGERS AM APPIMAGE APK BPM 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)
|
AM APK APPIMAGE
|
||||||
foreach(package_manager ${PACKAGE_MANAGERS})
|
- BREW
|
||||||
if(package_manager STREQUAL "WINGET")
|
+ BPM BREW
|
||||||
option(PACKAGES_DISABLE_${package_manager} "Disable ${package_manager} package manager detection by default" ON)
|
CARDS CHOCO
|
||||||
|
DPKG
|
||||||
|
EMERGE EOPKG
|
||||||
diff --git a/doc/json_schema.json b/doc/json_schema.json
|
diff --git a/doc/json_schema.json b/doc/json_schema.json
|
||||||
index f8198587..264d5e40 100644
|
index 2243fb6f..90c0dfe8 100644
|
||||||
--- a/doc/json_schema.json
|
--- a/doc/json_schema.json
|
||||||
+++ b/doc/json_schema.json
|
+++ b/doc/json_schema.json
|
||||||
@@ -442,7 +442,7 @@
|
@@ -446,7 +446,7 @@
|
||||||
"type": "string"
|
"type": "string"
|
||||||
},
|
},
|
||||||
"packagesFormat": {
|
"packagesFormat": {
|
||||||
@@ -25,7 +25,7 @@ index f8198587..264d5e40 100644
|
|||||||
},
|
},
|
||||||
"physicaldiskFormat": {
|
"physicaldiskFormat": {
|
||||||
diff --git a/src/detection/packages/packages.h b/src/detection/packages/packages.h
|
diff --git a/src/detection/packages/packages.h b/src/detection/packages/packages.h
|
||||||
index 0a2c4040..21dd279a 100644
|
index f0d42004..2e68903e 100644
|
||||||
--- a/src/detection/packages/packages.h
|
--- a/src/detection/packages/packages.h
|
||||||
+++ b/src/detection/packages/packages.h
|
+++ b/src/detection/packages/packages.h
|
||||||
@@ -8,6 +8,7 @@ typedef struct FFPackagesResult {
|
@@ -8,6 +8,7 @@ typedef struct FFPackagesResult {
|
||||||
@@ -37,11 +37,11 @@ index 0a2c4040..21dd279a 100644
|
|||||||
uint32_t brewCask;
|
uint32_t brewCask;
|
||||||
uint32_t cards;
|
uint32_t cards;
|
||||||
diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c
|
diff --git a/src/detection/packages/packages_linux.c b/src/detection/packages/packages_linux.c
|
||||||
index 98a01b23..41ad97fb 100644
|
index 79de8cb3..dc8cf080 100644
|
||||||
--- a/src/detection/packages/packages_linux.c
|
--- a/src/detection/packages/packages_linux.c
|
||||||
+++ b/src/detection/packages/packages_linux.c
|
+++ b/src/detection/packages/packages_linux.c
|
||||||
@@ -540,6 +540,9 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
|
@@ -540,6 +540,9 @@ static void getPackageCounts(FFstrbuf* baseDir, FFPackagesResult* packageCounts,
|
||||||
if (!(options->disabled & FF_PACKAGES_FLAG_CARDS_BIT)) {
|
if (FF_PACKAGES_IS_ENABLED(options, CARDS)) {
|
||||||
packageCounts->cards += getNumElements(baseDir, "/var/lib/pkg/DB", true);
|
packageCounts->cards += getNumElements(baseDir, "/var/lib/pkg/DB", true);
|
||||||
}
|
}
|
||||||
+ if (!(options->disabled & FF_PACKAGES_FLAG_BPM_BIT)) {
|
+ if (!(options->disabled & FF_PACKAGES_FLAG_BPM_BIT)) {
|
||||||
@@ -50,11 +50,35 @@ index 98a01b23..41ad97fb 100644
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void getPackageCountsRegular(FFstrbuf* baseDir, FFPackagesResult* packageCounts, FFPackagesOptions* options) {
|
static void getPackageCountsRegular(FFstrbuf* baseDir, FFPackagesResult* packageCounts, FFPackagesOptions* options) {
|
||||||
diff --git a/src/logo/ascii/tidelinux.txt b/src/logo/ascii/tidelinux.txt
|
diff --git a/src/logo/ascii/t.inc b/src/logo/ascii/t.inc
|
||||||
|
index 53947eab..bedeac3b 100644
|
||||||
|
--- a/src/logo/ascii/t.inc
|
||||||
|
+++ b/src/logo/ascii/t.inc
|
||||||
|
@@ -85,6 +85,19 @@ static const FFlogo T[] = {
|
||||||
|
},
|
||||||
|
},
|
||||||
|
#endif
|
||||||
|
+ #ifdef FASTFETCH_DATATEXT_LOGO_TIDELINUX
|
||||||
|
+ // TideLinux
|
||||||
|
+ {
|
||||||
|
+ .names = {"Tide Linux"},
|
||||||
|
+ .lines = FASTFETCH_DATATEXT_LOGO_TIDELINUX,
|
||||||
|
+ .colors = {
|
||||||
|
+ FF_COLOR_FG_256 "27",
|
||||||
|
+ FF_COLOR_FG_256 "39",
|
||||||
|
+ },
|
||||||
|
+ .colorTitle = FF_COLOR_FG_BLUE,
|
||||||
|
+ .colorKeys = FF_COLOR_FG_MAGENTA,
|
||||||
|
+ },
|
||||||
|
+ #endif
|
||||||
|
#ifdef FASTFETCH_DATATEXT_LOGO_TORIZONCORE
|
||||||
|
// Torizon OS
|
||||||
|
{
|
||||||
|
diff --git a/src/logo/ascii/t/tidelinux.txt b/src/logo/ascii/t/tidelinux.txt
|
||||||
new file mode 100644
|
new file mode 100644
|
||||||
index 00000000..2d8b44e3
|
index 00000000..2d8b44e3
|
||||||
--- /dev/null
|
--- /dev/null
|
||||||
+++ b/src/logo/ascii/tidelinux.txt
|
+++ b/src/logo/ascii/t/tidelinux.txt
|
||||||
@@ -0,0 +1,14 @@
|
@@ -0,0 +1,14 @@
|
||||||
+ $1@@@@ $1@@@$2*
|
+ $1@@@@ $1@@@$2*
|
||||||
+ $1@@$2~~~~$1@@ $1@@$2~~~
|
+ $1@@$2~~~~$1@@ $1@@$2~~~
|
||||||
@@ -70,42 +94,20 @@ index 00000000..2d8b44e3
|
|||||||
+ $1@@$2~~ $2~$1@ $1@@@$2~~
|
+ $1@@$2~~ $2~$1@ $1@@@$2~~
|
||||||
+ $2*$1@@$2~~ $2~$1@@@@$2~~~
|
+ $2*$1@@$2~~ $2~$1@@@@$2~~~
|
||||||
+ $2~~ $2~~~~
|
+ $2~~ $2~~~~
|
||||||
diff --git a/src/logo/builtin.c b/src/logo/builtin.c
|
|
||||||
index 1775a627..67406106 100644
|
|
||||||
--- a/src/logo/builtin.c
|
|
||||||
+++ b/src/logo/builtin.c
|
|
||||||
@@ -4992,6 +4992,17 @@ static const FFlogo T[] = {
|
|
||||||
FF_COLOR_FG_GREEN,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
+ // TideLinux
|
|
||||||
+ {
|
|
||||||
+ .names = {"Tide Linux"},
|
|
||||||
+ .lines = FASTFETCH_DATATEXT_LOGO_TIDELINUX,
|
|
||||||
+ .colors = {
|
|
||||||
+ FF_COLOR_FG_256 "27",
|
|
||||||
+ FF_COLOR_FG_256 "39",
|
|
||||||
+ },
|
|
||||||
+ .colorTitle = FF_COLOR_FG_BLUE,
|
|
||||||
+ .colorKeys = FF_COLOR_FG_MAGENTA,
|
|
||||||
+ },
|
|
||||||
// Torizon OS
|
|
||||||
{
|
|
||||||
.names = { "Torizon OS", "TorizonCore" },
|
|
||||||
diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h
|
diff --git a/src/modules/packages/option.h b/src/modules/packages/option.h
|
||||||
index 60184943..0b68d0d0 100644
|
index 1e895335..931dda08 100644
|
||||||
--- a/src/modules/packages/option.h
|
--- a/src/modules/packages/option.h
|
||||||
+++ b/src/modules/packages/option.h
|
+++ b/src/modules/packages/option.h
|
||||||
@@ -39,6 +39,7 @@ typedef enum FF_A_PACKED FFPackagesFlags {
|
@@ -39,6 +39,7 @@ typedef enum FF_A_PACKED FFPackagesFlags {
|
||||||
FF_PACKAGES_FLAG_MOSS_BIT = 1ULL << 32,
|
FF_PACKAGES_FLAG_MOSS_BIT = UINT64_C(1) << 32U,
|
||||||
FF_PACKAGES_FLAG_APPIMAGE_BIT = 1ULL << 33,
|
FF_PACKAGES_FLAG_APPIMAGE_BIT = UINT64_C(1) << 33U,
|
||||||
FF_PACKAGES_FLAG_CARDS_BIT = 1ULL << 34,
|
FF_PACKAGES_FLAG_CARDS_BIT = UINT64_C(1) << 34U,
|
||||||
+ FF_PACKAGES_FLAG_BPM_BIT = 1ULL << 35,
|
+ FF_PACKAGES_FLAG_BPM_BIT = UINT64_C(1) << 35U,
|
||||||
FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX,
|
FF_PACKAGES_FLAG_FORCE_UNSIGNED = UINT64_MAX,
|
||||||
} FFPackagesFlags;
|
} FFPackagesFlags;
|
||||||
static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), "");
|
static_assert(sizeof(FFPackagesFlags) == sizeof(uint64_t), "");
|
||||||
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
|
diff --git a/src/modules/packages/packages.c b/src/modules/packages/packages.c
|
||||||
index a0012047..424ed43e 100644
|
index 4ef1d049..e55577bf 100644
|
||||||
--- a/src/modules/packages/packages.c
|
--- a/src/modules/packages/packages.c
|
||||||
+++ b/src/modules/packages/packages.c
|
+++ b/src/modules/packages/packages.c
|
||||||
@@ -55,6 +55,7 @@ bool ffPrintPackages(FFPackagesOptions* options) {
|
@@ -55,6 +55,7 @@ bool ffPrintPackages(FFPackagesOptions* options) {
|
||||||
@@ -124,7 +126,7 @@ index a0012047..424ed43e 100644
|
|||||||
FF_ARG(counts.brew, "brew"),
|
FF_ARG(counts.brew, "brew"),
|
||||||
FF_ARG(brewAll, "brew-all"),
|
FF_ARG(brewAll, "brew-all"),
|
||||||
FF_ARG(counts.brewCask, "brew-cask"),
|
FF_ARG(counts.brewCask, "brew-cask"),
|
||||||
@@ -245,6 +247,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) {
|
@@ -246,6 +248,7 @@ void ffParsePackagesJsonObject(FFPackagesOptions* options, yyjson_val* module) {
|
||||||
if (false)
|
if (false)
|
||||||
;
|
;
|
||||||
FF_TEST_PACKAGE_NAME(BREW)
|
FF_TEST_PACKAGE_NAME(BREW)
|
||||||
@@ -132,7 +134,7 @@ index a0012047..424ed43e 100644
|
|||||||
break;
|
break;
|
||||||
case 'C':
|
case 'C':
|
||||||
if (false)
|
if (false)
|
||||||
@@ -373,6 +376,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
|
@@ -376,6 +379,7 @@ void ffGeneratePackagesJsonConfig(FFPackagesOptions* options, yyjson_mut_doc* do
|
||||||
FF_TEST_PACKAGE_NAME(AM)
|
FF_TEST_PACKAGE_NAME(AM)
|
||||||
FF_TEST_PACKAGE_NAME(APK)
|
FF_TEST_PACKAGE_NAME(APK)
|
||||||
FF_TEST_PACKAGE_NAME(APPIMAGE)
|
FF_TEST_PACKAGE_NAME(APPIMAGE)
|
||||||
@@ -140,7 +142,7 @@ index a0012047..424ed43e 100644
|
|||||||
FF_TEST_PACKAGE_NAME(BREW)
|
FF_TEST_PACKAGE_NAME(BREW)
|
||||||
FF_TEST_PACKAGE_NAME(CARDS)
|
FF_TEST_PACKAGE_NAME(CARDS)
|
||||||
FF_TEST_PACKAGE_NAME(CHOCO)
|
FF_TEST_PACKAGE_NAME(CHOCO)
|
||||||
@@ -431,6 +435,7 @@ bool ffGeneratePackagesJsonResult(FF_A_UNUSED FFPackagesOptions* options, yyjson
|
@@ -435,6 +439,7 @@ bool ffGeneratePackagesJsonResult(FFPackagesOptions* options, yyjson_mut_doc* do
|
||||||
FF_APPEND_PACKAGE_COUNT(amUser)
|
FF_APPEND_PACKAGE_COUNT(amUser)
|
||||||
FF_APPEND_PACKAGE_COUNT(appimage)
|
FF_APPEND_PACKAGE_COUNT(appimage)
|
||||||
FF_APPEND_PACKAGE_COUNT(apk)
|
FF_APPEND_PACKAGE_COUNT(apk)
|
||||||
@@ -148,7 +150,7 @@ index a0012047..424ed43e 100644
|
|||||||
FF_APPEND_PACKAGE_COUNT(brew)
|
FF_APPEND_PACKAGE_COUNT(brew)
|
||||||
FF_APPEND_PACKAGE_COUNT(brewCask)
|
FF_APPEND_PACKAGE_COUNT(brewCask)
|
||||||
FF_APPEND_PACKAGE_COUNT(cards)
|
FF_APPEND_PACKAGE_COUNT(cards)
|
||||||
@@ -529,6 +534,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
|
@@ -535,6 +540,7 @@ FFModuleBaseInfo ffPackagesModuleInfo = {
|
||||||
{ "Number of macports packages", "macports" },
|
{ "Number of macports packages", "macports" },
|
||||||
{ "Number of mport packages", "mport" },
|
{ "Number of mport packages", "mport" },
|
||||||
{ "Number of moss packages", "moss" },
|
{ "Number of moss packages", "moss" },
|
||||||
|
|||||||
Reference in New Issue
Block a user