random-mirrors/dockur-windows
1
0
Fork 0
mirror of https://github.com/dockur/windows.git synced 2026-08-03 20:47:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: Refine batch script linting (#2016)

Browse Source
This commit is contained in:
Kroese
2026-07-28 01:51:55 +02:00
committed by GitHub
parent 22091ceb67
commit 6389212ca7
1 changed files with 39 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/image.sh
+39 -57
View File
@@ -935,9 +935,9 @@ reportBatchMatches() {
checkBatch() { checkBatch() {
local file="$1" local file="$1"
local report="N"
local tmp output local tmp output
local matches line local matches line
local enabled_rules
[ -s "$file" ] || return 0 [ -s "$file" ] || return 0
@@ -949,81 +949,63 @@ checkBatch() {
local source="your install.bat file" local source="your install.bat file"
[ -n "${COMMAND:-}" ] && source="your COMMAND variable" [ -n "${COMMAND:-}" ] && source="your COMMAND variable"
# Only check rules that indicate likely execution or behavioural failures.
enabled_rules="E001,E002,E003,E004,E005,E006,E007,E008"
enabled_rules+=",E009,E010,E011,E012,E013,E014,E015,E016"
enabled_rules+=",E017,E018,E019,E020,E021,E022,E023,E024"
enabled_rules+=",E025,E027,E028,E029,E030,E031,E032,E033,E034"
enabled_rules+=",W004,W005,W013,W017,W021,W022,W034,W038,W040"
if enabled "$DEBUG"; then if enabled "$DEBUG"; then
report="Y"
if LC_ALL=C grep -Pq '[^\x09\x0D\x20-\x7E]' "$file"; then if LC_ALL=C grep -Pq '[^\x09\x0D\x20-\x7E]' "$file"; then
warn "non-ASCII characters were detected in $source and may not execute correctly in Windows Command Prompt." warn "non-ASCII characters were detected in $source and may not execute correctly in Windows Command Prompt."
fi fi
else
# First pass: silently check only for Error-level findings.
cat > "$tmp/blinter.ini" <<'EOC'
[general]
min_severity = error
EOC
if ! (
cd "$tmp"
python3 -m blinter "$file" >/dev/null 2>&1
); then
report="Y"
fi
fi fi
if enabled "$report"; then cat > "$tmp/blinter.ini" <<EOC
# Show useful diagnostic context, while excluding findings that are
# irrelevant to unattended OEM scripts.
cat > "$tmp/blinter.ini" <<'EOC'
[general] [general]
min_severity = warning min_severity = warning
show_summary = false show_summary = false
[rules] [rules]
disabled_rules = W001,W025,W028,W033,W041,SEC002,SEC005 enabled_rules = $enabled_rules
EOC EOC
output=$( output=$(
cd "$tmp" cd "$tmp"
python3 -m blinter "$file" 2>&1 || true python3 -m blinter "$file" 2>&1 || true
) )
# Remove header # Remove header.
output=$( output=$(
awk ' awk '
/^DETAILED ISSUES:/ { /^DETAILED ISSUES:/ {
found = 1 found = 1
next next
}
found && !started {
if (/^-+$/) {
started = 1
} }
next
}
found && !started { started {
if (/^-+$/) { print
started = 1 }
} ' <<< "$output"
next )
}
started { output="${output#"${output%%[!$'\r\n ']*}"}"
print output="${output%"${output##*[!$'\r\n ']}"}"
}
' <<< "$output"
)
output="${output#"${output%%[!$'\r\n ']*}"}" if grep -Eq \
output="${output%"${output##*[!$'\r\n ']}"}" '^(ERROR|WARNING|SECURITY) LEVEL ISSUES:$' \
<<< "$output"; then
if grep -Eq \
'^(ERROR|WARNING|SECURITY) LEVEL ISSUES:$' \
<<< "$output"; then
warn "possible issues were detected in $source:"
printf '\n%s\n\n' "$output" >&2
fi
warn "possible issues were detected in $source:"
printf '\n%s\n\n' "$output" >&2
fi fi
rm -rf "$tmp" || true rm -rf "$tmp" || true