Skip to content

Commit 757e627

Browse files
CarterLiCarterLi
authored
Merge pull request #840 from fastfetch-cli/dev
Release: v2.11.1
2 parents d7ea774 + c5c846a commit 757e627

File tree

19 files changed

+178
-22
lines changed

19 files changed

+178
-22
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,41 @@ jobs:
158158
name: fastfetch-linux-aarch64
159159
path: ./fastfetch-*.*
160160

161+
linux-armv7:
162+
name: Linux-armv7
163+
runs-on: ubuntu-22.04
164+
permissions:
165+
security-events: write
166+
contents: read
167+
steps:
168+
- name: checkout repository
169+
uses: actions/checkout@v4
170+
171+
- name: run VM
172+
uses: uraimo/run-on-arch-action@v2
173+
id: runcmd
174+
with:
175+
arch: armv7
176+
distro: ubuntu22.04
177+
githubToken: ${{ github.token }}
178+
run: |
179+
uname -a
180+
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libnm-dev libpulse-dev libdrm-dev libddcutil-dev libchafa-dev directx-headers-dev rpm
181+
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
182+
cmake --build . --target package --verbose -j4
183+
./fastfetch --list-features
184+
time ./fastfetch -c presets/ci.jsonc
185+
time ./fastfetch -c presets/ci.jsonc --format json
186+
time ./flashfetch
187+
ldd fastfetch
188+
ctest
189+
190+
- name: upload artifacts
191+
uses: actions/upload-artifact@v4
192+
with:
193+
name: fastfetch-linux-armv7
194+
path: ./fastfetch-*.*
195+
161196
musl-amd64:
162197
name: Musl-amd64
163198
runs-on: ubuntu-latest
@@ -501,6 +536,7 @@ jobs:
501536
needs:
502537
- linux-amd64
503538
- linux-aarch64
539+
- linux-armv7
504540
- musl-amd64
505541
- musl-aarch64
506542
- macos-universal

‎CHANGELOG.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
# 2.11.1
2+
3+
Hotfix for Android
4+
5+
Bugfixes:
6+
* Fix uninitialized variables which can cause crashes (#760 #838, Battery, Android)
7+
* Don't detect hyfetch as shell when used as a backend of hyfetch
8+
* Fix incorrect information in man page
9+
10+
Features:
11+
* Support sorcery package manager detection (Packages, Linux)
12+
* Make `--custom-format` optional (Custom)
13+
* Make `/` an alias of `C:\` for `--disk-folders` (Disk, Windows)
14+
15+
Logo:
16+
* Fix colors of Source Mage logo
17+
18+
119
# 2.11.0
220

321
Changes:

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required(VERSION 3.12.0) # target_link_libraries with OBJECT libs & project homepage url
22

33
project(fastfetch
4-
VERSION 2.11.0
4+
VERSION 2.11.1
55
LANGUAGES C
66
DESCRIPTION "Fast neofetch-like system information tool"
77
HOMEPAGE_URL "https://github.com/fastfetch-cli/fastfetch"

‎doc/fastfetch.1.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ The specified configuration/preset files are searched in the following order:
125125
When both a '.jsonc' and a '.conf' file with the same name is found,
126126
the '.jsonc' file is preferred.
127127

128-
Fastfetch provides some default presets. List them with \fB \-\-print\-available\-presets\fR.
128+
Fastfetch provides some default presets. List them with \fB\-\-list\-presets\fR.
129129

130130
.SH "SEE ALSO"
131131
.BR neofetch (1)

‎doc/json_schema.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,6 +1117,9 @@
11171117
"maxItems": 2
11181118
}
11191119
}
1120+
},
1121+
"key": {
1122+
"$ref": "#/$defs/key"
11201123
}
11211124
}
11221125
},
@@ -1174,10 +1177,7 @@
11741177
"description": "Text to print",
11751178
"type": "string"
11761179
}
1177-
},
1178-
"required": [
1179-
"format"
1180-
]
1180+
}
11811181
},
11821182
{
11831183
"title": "Display",
@@ -1238,7 +1238,7 @@
12381238
},
12391239
"folders": {
12401240
"type": "string",
1241-
"description": "A colon (semicolon on Windows) separated list of folder paths for the disk output\nDefault: auto detection using mount-points"
1241+
"description": "A colon (semicolon on Windows) separated list of folder paths for the disk output\nDefault: auto detection using mount-points\nThis option overrides other `show*` options"
12421242
},
12431243
"showExternal": {
12441244
"type": "boolean",

‎presets/examples/11.jsonc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "file:///C:/msys64/home/zhang/fastfetch/doc/json_schema.json",
2+
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
33
"logo": {
44
"type": "small"
55
},

‎presets/examples/13.jsonc‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
{
2+
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
3+
"logo": {
4+
"type": "small",
5+
"padding": {
6+
"top": 1
7+
}
8+
},
9+
"display": {
10+
"separator": "",
11+
"keyWidth": 15
12+
},
13+
"modules": [
14+
{
15+
"key": "╭───────────╮",
16+
"type": "custom"
17+
},
18+
{
19+
// draw borders first to make colors of left and right border consistant
20+
"key": "│ │\u001b[11D\u001b[31m user",
21+
"type": "title",
22+
"format": "{1}"
23+
},
24+
{
25+
"key": "│ │\u001b[11D\u001b[32m󰇅 hname",
26+
"type": "title",
27+
"format": "{2}"
28+
},
29+
{
30+
"key": "│ │\u001b[11D\u001b[33m󰅐 uptime",
31+
"type": "uptime"
32+
},
33+
{
34+
"key": "│ │\u001b[11D\u001b[34m󰟾 distro",
35+
"type": "os"
36+
},
37+
{
38+
"key": "│ │\u001b[11D\u001b[35m kernel",
39+
"type": "kernel"
40+
},
41+
{
42+
"key": "│ │\u001b[11D\u001b[36m󰇄 desktop",
43+
"type": "de"
44+
},
45+
{
46+
"key": "│ │\u001b[11D\u001b[31m term",
47+
"type": "terminal"
48+
},
49+
{
50+
"key": "│ │\u001b[11D\u001b[32m shell",
51+
"type": "shell"
52+
},
53+
{
54+
"key": "│ │\u001b[11D\u001b[33m󰍛 cpu",
55+
"type": "cpu"
56+
},
57+
{
58+
"key": "│ │\u001b[11D\u001b[34m󰉉 disk",
59+
"type": "disk",
60+
"folders": "/"
61+
},
62+
{
63+
"key": "│ │\u001b[11D\u001b[35m memory",
64+
"type": "memory"
65+
},
66+
{
67+
"key": "│ │\u001b[11D\u001b[36m󰩟 network",
68+
"type": "localip",
69+
"format": "{1} ({4})"
70+
},
71+
{
72+
"key": "├───────────┤",
73+
"type": "custom"
74+
},
75+
{
76+
"key": "│ │\u001b[11D\u001b[m colors",
77+
"type": "colors",
78+
"symbol": "circle"
79+
},
80+
{
81+
"key": "╰───────────╯",
82+
"type": "custom"
83+
}
84+
]
85+
}

‎src/data/help.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,8 @@
947947
},
948948
{
949949
"long": "disk-folders",
950-
"desc": "A colon (semicolon on Windows) separated list of folder paths for the disk output",
950+
"desc": "A colon (semicolon on Windows) separated list of folder paths to be detected",
951+
"remark": "On Windows, a drive latter must be upper cased and end with \"\\\". \"/\" is used as an alias of the system drive. This option overrides other disk-show-* options",
951952
"arg": {
952953
"type": "path",
953954
"default": "Auto detection using mount-points"

‎src/detection/battery/battery_android.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ static const char* parseTermuxApi(FFBatteryOptions* options, FFlist* results)
4040
ffStrbufInit(&battery->modelName);
4141
ffStrbufInit(&battery->status);
4242
ffStrbufInit(&battery->technology);
43+
ffStrbufInit(&battery->serial);
4344
ffStrbufInit(&battery->manufactureDate);
4445

4546
battery->capacity = yyjson_get_num(yyjson_obj_get(root, "percentage"));
@@ -77,6 +78,8 @@ static const char* parseDumpsys(FFBatteryOptions* options, FFlist* results)
7778
ffStrbufInit(&battery->modelName);
7879
ffStrbufInit(&battery->status);
7980
ffStrbufInit(&battery->technology);
81+
ffStrbufInit(&battery->serial);
82+
ffStrbufInit(&battery->manufactureDate);
8083

8184
if (ffParsePropLines(start, "AC powered: ", &temp) && ffStrbufEqualS(&temp, "true"))
8285
ffStrbufAppendS(&battery->status, "AC powered");

‎src/detection/disk/disk_windows.c‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#include <windows.h>
66
#include <winioctl.h>
7-
#include <assert.h>
87

98
const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
109
{
@@ -15,6 +14,14 @@ const char* ffDetectDisksImpl(FFDiskOptions* options, FFlist* disks)
1514

1615
FF_STRBUF_AUTO_DESTROY buffer = ffStrbufCreate();
1716

17+
// For cross-platform portability; used by `presets/examples/13.jsonc`
18+
if (__builtin_expect(options->folders.length == 1 && options->folders.chars[0] == '/', 0))
19+
{
20+
wchar_t path[MAX_PATH + 1];
21+
GetSystemWindowsDirectoryW(path, sizeof(path) / sizeof(*path));
22+
ffStrbufSetF(&options->folders, "%c:\\", (char) path[0]);
23+
}
24+
1825
for(uint32_t i = 0; i < length; i++)
1926
{
2027
wchar_t* mountpoint = buf + i;

0 commit comments

Comments
 (0)