Fix lints

This commit is contained in:
Edwin Kofler 2026-08-02 03:41:00 -07:00
parent b3e96f2e6a
commit 76557b5744
No known key found for this signature in database
GPG key ID: 36A071730364C1F3

View file

@ -1,9 +1,11 @@
#!/usr/bin/env python3
import re
import os
import argparse
import os
import re
import sys
from collections.abc import Callable # Compatability.
from pathlib import Path
from typing import Callable, List, Dict, Any # compat
from typing import Any
# This file checks Bash and Shell scripts for violations not found with
# shellcheck or existing methods. You can use it in several ways:
@ -21,7 +23,7 @@ from typing import Callable, List, Dict, Any # compat
# Check to ensure all regular expressions are working as intended:
# $ ./scripts/checkstyle.py --internal-test-regex
Rule = Dict[str, Any]
Rule = dict[str, Any]
class c:
RED = '\033[91m'
@ -91,7 +93,7 @@ def noVerboseRedirectionFixer(line: str, m: Any) -> str:
return f'{prestr}&>/dev/null{poststr}'
def lintfile(file: Path, rules: List[Rule], options: Dict[str, Any]):
def lintfile(file: Path, rules: list[Rule], options: dict[str, Any]):
content_arr = file.read_text().split('\n')
for line_i, line in enumerate(content_arr):
@ -100,6 +102,7 @@ def lintfile(file: Path, rules: List[Rule], options: Dict[str, Any]):
for rule in rules:
should_run = False
# ruff: noqa: SIM102
if 'sh' in rule['fileTypes']:
if file.name.endswith('.sh'):
should_run = True
@ -108,7 +111,7 @@ def lintfile(file: Path, rules: List[Rule], options: Dict[str, Any]):
should_run = True
if options['verbose']:
print(f'{str(file)}: {should_run}')
print(f'{file!s}: {should_run}')
if not should_run:
continue
@ -134,7 +137,7 @@ def lintfile(file: Path, rules: List[Rule], options: Dict[str, Any]):
file.write_text('\n'.join(content_arr))
def main():
rules: List[Rule] = [
rules: list[Rule] = [
{
'name': 'no-pwd-capture',
'regex': '(?P<match>\\$\\(pwd\\))',
@ -255,8 +258,8 @@ def main():
# exit
if grand_total == 0:
exit(0)
sys.exit(0)
else:
exit(2)
sys.exit(2)
main()