Skip to content

Commit a0aafed

Browse files
committed
chore: minor changes
Signed-off-by: ale5000 <15793015+ale5000-git@users.noreply.github.com>
1 parent 9d2064d commit a0aafed

File tree

14 files changed

+63
-30
lines changed

14 files changed

+63
-30
lines changed

.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
"customLocalFormatters.formatters": [
3838
{
39-
"command": "rstfmt --width 79 -",
39+
"command": "rstfmt --width 80 -",
4040
"languages": ["restructuredtext"],
4141
"editor.formatOnSave": false
4242
}

.vscode/tasks.json

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
"tasks": [
88
{
99
"label": "buildOta",
10-
"detail": "$(tools) Build the flashable OTA zip.",
10+
"icon": { "id": "rocket", "color": "terminal.ansiCyan" },
11+
"detail": "Build the flashable zip [Full edition].",
1112
"type": "shell",
1213
"command": "${workspaceFolder}/build.sh",
1314
"windows": {
@@ -18,14 +19,26 @@
1819
"BUILD_TYPE": "full"
1920
}
2021
},
21-
"group": {
22-
"kind": "build"
23-
},
24-
"problemMatcher": []
22+
"group": "build",
23+
"problemMatcher": {
24+
"owner": "shell-build",
25+
"fileLocation": "search",
26+
"pattern": [
27+
{
28+
"regexp": "^([^:]+):(\\d+):\\s+(ERROR|WARNING):\\s+\\[([^\\]]*)\\]\\s+(.*)$",
29+
"file": 1,
30+
"line": 2,
31+
"severity": 3,
32+
"code": 4,
33+
"message": 5
34+
}
35+
]
36+
}
2537
},
2638
{
2739
"label": "buildOtaOSS",
28-
"detail": "$(tools) Build the flashable OTA zip (open-source components only).",
40+
"icon": { "id": "rocket", "color": "terminal.ansiGreen" },
41+
"detail": "Build the flashable zip [OSS edition].",
2942
"type": "shell",
3043
"command": "${workspaceFolder}/build.sh",
3144
"windows": {
@@ -36,15 +49,26 @@
3649
"BUILD_TYPE": "oss"
3750
}
3851
},
39-
"group": {
40-
"kind": "build",
41-
"isDefault": true
42-
},
43-
"problemMatcher": []
52+
"group": "build",
53+
"problemMatcher": {
54+
"owner": "shell-build",
55+
"fileLocation": "search",
56+
"pattern": [
57+
{
58+
"regexp": "^([^:]+):(\\d+):\\s+(ERROR|WARNING):\\s+\\[([^\\]]*)\\]\\s+(.*)$",
59+
"file": 1,
60+
"line": 2,
61+
"severity": 3,
62+
"code": 4,
63+
"message": 5
64+
}
65+
]
66+
}
4467
},
4568
{
4669
"label": "installTest",
47-
"detail": "Emulate an Android recovery on your PC and run the flashable zip file inside it to see the result.",
70+
"icon": { "id": "beaker", "color": "terminal.ansiYellow" },
71+
"detail": "Test the flashable zip in a simulated Android recovery environment on your PC.",
4872
"type": "shell",
4973
"command": "${workspaceFolder}/recovery-simulator/recovery.sh",
5074
"args": ["${workspaceFolder}/output/*.zip"],
@@ -65,6 +89,14 @@
6589
"panel": "dedicated"
6690
},
6791
"problemMatcher": []
92+
},
93+
{
94+
"label": "reuse-lint",
95+
"icon": { "id": "law", "color": "terminal.ansiMagenta" },
96+
"detail": "Verify license and copyright compliance (REUSE).",
97+
"type": "shell",
98+
"command": "reuse",
99+
"args": ["lint"]
68100
}
69101
]
70102
}

README.rst

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,7 @@ If you want to improve the project, please review our `contributing guidelines
110110
We are grateful for all our contributors! 🎉 Seriously — every bug fix,
111111
improvement, or creative complaint has made this better.
112112

113-
Please check the `contributors list <./docs/CONTRIBUTORS.md>`_ for more
114-
details.
113+
Please check the `contributors list <./docs/CONTRIBUTORS.md>`_ for more details.
115114

116115
*(Even fixing a typo counts. Probably. We'll review it very carefully either
117116
way.)*
@@ -124,8 +123,8 @@ Donations
124123
:alt: Support this project
125124
:target: ./docs/DONATE.rst
126125

127-
I maintain this project on my own in my spare time — the finite, precious
128-
kind that competes with sleep, meals eaten while staring at a terminal, and the
126+
I maintain this project on my own in my spare time — the finite, precious kind
127+
that competes with sleep, meals eaten while staring at a terminal, and the
129128
occasional social obligation.
130129

131130
If it's saved you time, or frustration, please consider supporting its

tools/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
..
2-
SPDX-FileCopyrightText: (c) 2016 ale5000
2+
SPDX-FileCopyrightText: 2016 ale5000
33
SPDX-License-Identifier: GPL-3.0-or-later
44
SPDX-FileType: DOCUMENTATION
55

tools/win/etc/profile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/usr/bin/env sh
2-
# SPDX-FileCopyrightText: (c) 2024 ale5000
2+
# SPDX-FileCopyrightText: 2024 ale5000
33
# SPDX-License-Identifier: GPL-3.0-or-later
4+
45
# shellcheck enable=all
56
# shellcheck disable=SC3043 # Ignore: In POSIX sh, 'local' is undefined
67

tools/win/start.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env sh
2-
3-
# SPDX-FileCopyrightText: (c) 2024 ale5000
2+
# SPDX-FileCopyrightText: 2024 ale5000
43
# SPDX-License-Identifier: GPL-3.0-or-later
4+
55
# shellcheck enable=all
66

77
if test "${1-}" = '-h' || test "${1-}" = '--help'; then set -- '/?'; fi

tools/win/ver.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env sh
2-
3-
# SPDX-FileCopyrightText: (c) 2024 ale5000
2+
# SPDX-FileCopyrightText: 2024 ale5000
43
# SPDX-License-Identifier: GPL-3.0-or-later
4+
55
# shellcheck enable=all
66

77
if test "${1-}" = '-h' || test "${1-}" = '--help'; then set -- '/?'; fi

zip-content/CONTENTS.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
..
2-
SPDX-FileCopyrightText: (c) 2016 ale5000
2+
SPDX-FileCopyrightText: 2016 ale5000
33
SPDX-License-Identifier: GPL-3.0-or-later
44
SPDX-FileType: DOCUMENTATION
55

zip-content/META-INF/com/google/android/update-binary.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/sbin/sh
2-
# SPDX-FileCopyrightText: (c) 2016 ale5000
2+
# SPDX-FileCopyrightText: 2016 ale5000
33
# SPDX-License-Identifier: GPL-3.0-or-later
44

55
# shellcheck enable=all

zip-content/customize.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/sbin/sh
2-
# SPDX-FileCopyrightText: (c) 2016 ale5000
2+
# SPDX-FileCopyrightText: 2016 ale5000
33
# SPDX-License-Identifier: GPL-3.0-or-later
44

55
# shellcheck enable=all

0 commit comments

Comments
 (0)