Fix dead/incorrect vars and consolidate duplicated logic into common.sh
Codebase-wide audit pass: fixed real bugs (SSH hangs missing BatchMode, local-outside-function no-ops, variable name collisions, a truncated ratio calc, wrong state-dir path, DARK vs NO_INTERNET drift, and more), then pulled logic that was duplicated across multiple scripts — arr cleanup safety gates, docker restart ordering, container maintenance stop/restart, watchdog state-file helpers, partnership role resolution, cert expiry checks, remote node discovery, and TMDB discovery scoring — into common.sh so each now has a single implementation.
This commit is contained in:
@@ -138,11 +138,8 @@ _build_drive_list() {
|
||||
[[ ! -e "$drive" ]] && continue
|
||||
local drive_name
|
||||
drive_name=$(basename "$drive")
|
||||
local ignored=false
|
||||
for ignore in "${SMART_IGNORE_DRIVES[@]:-}"; do
|
||||
[[ "$drive_name" == "$ignore" ]] && ignored=true && break
|
||||
done
|
||||
[[ "$ignored" == true ]] && { log "Skipping $drive_name (SMART_IGNORE_DRIVES)"; continue; }
|
||||
is_in_list "$drive_name" "${SMART_IGNORE_DRIVES[@]:-}" && \
|
||||
{ log "Skipping $drive_name (SMART_IGNORE_DRIVES)"; continue; }
|
||||
if ! smartctl -i "$drive" 2>/dev/null | grep -q "SMART support is: Enabled"; then
|
||||
log "Skipping $drive_name — SMART not enabled"
|
||||
continue
|
||||
@@ -166,11 +163,7 @@ if [[ "$SHOW_STATUS" == true ]]; then
|
||||
drive_name=$(basename "$drive")
|
||||
local_result=$(smartctl -l selftest "$drive" 2>/dev/null | \
|
||||
grep -m1 "Extended" | awk '{print $NF}')
|
||||
ignored=false
|
||||
for ignore in "${SMART_IGNORE_DRIVES[@]:-}"; do
|
||||
[[ "$drive_name" == "$ignore" ]] && ignored=true && break
|
||||
done
|
||||
if [[ "$ignored" == true ]]; then
|
||||
if is_in_list "$drive_name" "${SMART_IGNORE_DRIVES[@]:-}"; then
|
||||
echo " $ICON_WARN $drive_name — ignored"
|
||||
else
|
||||
echo " $ICON_SMART $drive_name — last extended: ${local_result:-no result}"
|
||||
|
||||
Reference in New Issue
Block a user