ci: fix policy shellcheck warnings

Author: JadenJSJ

lib/policy/engine.sh

@@ -17,9 +17,9 @@ policy_array_matches() {
   for pattern in "$@"; do
     [[ -n "${pattern}" ]] || continue
     glob="${pattern//+/*}"
-    if [[ "${needle}" == ${glob} ]]; then
-      return 0
-    fi
+    case "${needle}" in
+      ${glob}) return 0 ;;
+    esac
   done
   return 1
 }

lib/policy/policy.sh

@@ -53,6 +53,26 @@ policy_json_array() {
   printf ']'
 }
 
+policy_active_ifaces_json() {
+  local raw item
+  local -a items=()
+
+  raw="$(policy_read_state_value "active_ifaces" || true)"
+  if [[ -z "${raw}" ]]; then
+    printf '[]'
+    return 0
+  fi
+
+  IFS=',' read -r -a items <<<"${raw}"
+  for item in "${items[@]}"; do
+    [[ -n "${item}" ]] || continue
+    policy_json_array "${items[@]}"
+    return 0
+  done
+
+  printf '[]'
+}
+
 policy_write_state() {
   local status="${1:?missing status}"
   local last_event="${2:-}"
@@ -206,14 +226,14 @@ policy_monitor_loop() {
       pending_event="${line}"
       pending_ts="$(timestamp_utc)"
       case "${line}" in
-        *inet*|*inet6*|*address*|*Deleted*) refresh_requested="true" ;;
+        *inet*|*address*|*Deleted*) refresh_requested="true" ;;
       esac
 
       while IFS= read -r -t "${BOX_POLICY_DEBOUNCE_SECONDS}" next_line <&"${POLICY_EVENTS[0]}"; do
         pending_event="${next_line}"
         pending_ts="$(timestamp_utc)"
         case "${next_line}" in
-          *inet*|*inet6*|*address*|*Deleted*) refresh_requested="true" ;;
+          *inet*|*address*|*Deleted*) refresh_requested="true" ;;
         esac
         marker_state="$(if policy_disable_marker_present; then printf 'present'; else printf 'absent'; fi)"
         if [[ "${marker_state}" != "${previous_marker_state}" ]]; then
@@ -346,7 +366,7 @@ policy_status_json() {
     "$(json_pair "applied_state" "$(policy_read_state_value "applied_state" || printf 'unchanged')")" \
     "$(json_pair "proxy_mode" "${BOX_POLICY_PROXY_MODE}")" \
     "$(json_num_pair "debounce_seconds" "${BOX_POLICY_DEBOUNCE_SECONDS}")" \
-    "\"active_ifaces\":$(policy_json_array $(tr ',' ' ' <<<"$(policy_read_state_value "active_ifaces" || true)"))" \
+    "\"active_ifaces\":$(policy_active_ifaces_json)" \
     "$(json_bool_pair "wifi_connected" "$(policy_read_state_value "wifi_connected" || printf 'false')")" \
     "$(json_pair "ssid" "$(policy_read_state_value "ssid" || true)")" \
     "$(json_pair "bssid" "$(policy_read_state_value "bssid" || true)")" \

packaging/scripts/systemd-lifecycle.sh

@@ -19,7 +19,7 @@ Usage:
 Notes:
   - disable/restart actions only manage units and do not delete /etc/box or /var/lib/box.
   - enable starts the core units, conditionally enables policy if configured, and enables the default
-    scheduled updater timer (`box-update-all.timer`).
+    scheduled updater timer (box-update-all.timer).
   - use package removal + manual purge only when full cleanup is explicitly desired.
 USAGE
 }

tests/integration/test_policy.sh

@@ -11,11 +11,15 @@ cleanup() {
   local pid
   if [[ -f "${BOX_RUN_DIR}/policy.pid" ]]; then
     pid="$(tr -d '[:space:]' <"${BOX_RUN_DIR}/policy.pid" || true)"
-    [[ -n "${pid:-}" ]] && kill -TERM "${pid}" >/dev/null 2>&1 || true
+    if [[ -n "${pid:-}" ]]; then
+      kill -TERM "${pid}" >/dev/null 2>&1 || true
+    fi
   fi
   if [[ -f "${BOX_RUN_DIR}/box.pid" ]]; then
     pid="$(tr -d '[:space:]' <"${BOX_RUN_DIR}/box.pid" || true)"
-    [[ -n "${pid:-}" ]] && kill -TERM "${pid}" >/dev/null 2>&1 || true
+    if [[ -n "${pid:-}" ]]; then
+      kill -TERM "${pid}" >/dev/null 2>&1 || true
+    fi
   fi
   rm -rf "${TMP_DIR}"
 }
@@ -93,11 +97,15 @@ force_reset_runtime() {
   local pid
   if [[ -f "${BOX_RUN_DIR}/policy.pid" ]]; then
     pid="$(tr -d '[:space:]' <"${BOX_RUN_DIR}/policy.pid" || true)"
-    [[ -n "${pid:-}" ]] && kill -TERM "${pid}" >/dev/null 2>&1 || true
+    if [[ -n "${pid:-}" ]]; then
+      kill -TERM "${pid}" >/dev/null 2>&1 || true
+    fi
   fi
   if [[ -f "${BOX_RUN_DIR}/box.pid" ]]; then
     pid="$(tr -d '[:space:]' <"${BOX_RUN_DIR}/box.pid" || true)"
-    [[ -n "${pid:-}" ]] && kill -TERM "${pid}" >/dev/null 2>&1 || true
+    if [[ -n "${pid:-}" ]]; then
+      kill -TERM "${pid}" >/dev/null 2>&1 || true
+    fi
   fi
   sleep 1
   rm -rf "${BOX_RUN_DIR}" "${BOX_VAR_DIR}" "${BOX_LOG_DIR}"