fix(qa): SonarCloud shellcheck — use [[ ]] tests + explicit returns

shelldre:S7688 use [[ instead of [ for conditional tests
shelldre:S7682 add explicit return at end of log() function

Affects scripts/run_bench_docker.sh and scripts/sweep_orchestrator.sh.

Author: nikolay-e

scripts/run_bench_docker.sh

@@ -8,14 +8,16 @@ LIMIT="${LIMIT:-9999}"
 SEEDS="${SEEDS:-42}"
 DATASET="${DATASET:-full}"
 HF_HOME_HOST="${HF_HOME_HOST:-$HOME/.cache/huggingface}"
+USE_BAKED_CACHE="${USE_BAKED_CACHE:-1}"
 CACHE_HOST="${CACHE_HOST:-$HOME/.cache/contextbench_repos}"
 REPO_ROOT="$(cd "$(dirname "$0")/.." && pwd)"
 
-mkdir -p "$CACHE_HOST" "$HF_HOME_HOST" "$REPO_ROOT/results/logs"
+mkdir -p "$HF_HOME_HOST" "$REPO_ROOT/results/logs"
+[[ "$USE_BAKED_CACHE" = "1" ]] || mkdir -p "$CACHE_HOST"
 
-IMAGE="treemapper-bench:latest"
+IMAGE="${IMAGE:-treemapper-bench:latest}"
 
-if [ "${BUILD:-1}" = "1" ]; then
+if [[ "${BUILD:-1}" = "1" ]]; then
   echo "[build] $IMAGE"
   docker build --platform linux/arm64 -f "$REPO_ROOT/Dockerfile.bench" -t "$IMAGE" "$REPO_ROOT"
 fi
@@ -32,6 +34,10 @@ for mode in hybrid ppr ego bm25; do
     LOG="$LOG_DIR/${TAG}_docker.log"
     T0=$(date -u +%s)
     echo "[run start] mode=$mode budget=$budget at $(date -u +%FT%TZ)" | tee -a "$SWEEP_LOG"
+    CACHE_MOUNT_ARGS=()
+    if [[ "$USE_BAKED_CACHE" != "1" ]]; then
+      CACHE_MOUNT_ARGS=(-v "$CACHE_HOST:/cache/contextbench_repos")
+    fi
     docker run --rm \
       --cpus="$CPUS" \
       --memory="$MEM" \
@@ -41,7 +47,7 @@ for mode in hybrid ppr ego bm25; do
       -e PYTHONUNBUFFERED=1 \
       -e HF_HOME=/cache/huggingface \
       -e HF_DATASETS_CACHE=/cache/huggingface/datasets \
-      -v "$CACHE_HOST:/cache/contextbench_repos" \
+      "${CACHE_MOUNT_ARGS[@]}" \
       -v "$HF_HOME_HOST:/cache/huggingface" \
       -v "$REPO_ROOT/results:/app/results" \
       -v "$REPO_ROOT/benchmarks:/app/benchmarks:ro" \

scripts/sweep_orchestrator.sh

@@ -10,7 +10,8 @@ mkdir -p "$LOG_DIR"
 
 CACHE_HOST="$HOME/.cache/contextbench_repos"
 HF_HOME_HOST="$HOME/.cache/huggingface"
-IMAGE="treemapper-bench:latest"
+IMAGE="${IMAGE:-treemapper-bench:latest}"
+USE_BAKED_CACHE="${USE_BAKED_CACHE:-1}"
 
 MIN_OK_THRESHOLD=550
 LIMIT=9999
@@ -41,6 +42,7 @@ declare -a CONFIGS=(
 
 log() {
   printf '[%s] %s\n' "$(date -u +%FT%TZ)" "$*" | tee -a "$SWEEP_LOG"
+  return 0
 }
 
 run_one_config() {
@@ -53,6 +55,10 @@ run_one_config() {
   local t0
   t0=$(date -u +%s)
   log "RUN start mode=$mode budget=$budget workers=$workers batch=$batch"
+  local cache_mount=()
+  if [[ "$USE_BAKED_CACHE" != "1" ]]; then
+    cache_mount=(-v "$CACHE_HOST:/cache/contextbench_repos")
+  fi
   docker run --rm \
     --cpus="$CPUS" \
     --memory="$MEM" \
@@ -62,7 +68,7 @@ run_one_config() {
     -e PYTHONUNBUFFERED=1 \
     -e HF_HOME=/cache/huggingface \
     -e HF_DATASETS_CACHE=/cache/huggingface/datasets \
-    -v "$CACHE_HOST:/cache/contextbench_repos" \
+    "${cache_mount[@]}" \
     -v "$HF_HOME_HOST:/cache/huggingface" \
     -v "$REPO_ROOT/results:/app/results" \
     -v "$REPO_ROOT/benchmarks:/app/benchmarks:ro" \
@@ -81,9 +87,9 @@ count_ok() {
   local mode="$1"
   local budget="$2"
   local f="$REPO_ROOT/results/cb_${mode}_n${LIMIT}_b${budget}.json"
-  if [ ! -f "$f" ]; then
+  if [[ ! -f "$f" ]]; then
     echo 0
-    return
+    return 0
   fi
   python3 -c "
 import json,sys
@@ -106,7 +112,7 @@ for cfg in "${CONFIGS[@]}"; do
   mode=$(echo "$cfg" | awk '{print $1}')
   budget=$(echo "$cfg" | awk '{print $2}')
   existing_ok=$(count_ok "$mode" "$budget")
-  if [ "$existing_ok" -ge "$MIN_OK_THRESHOLD" ]; then
+  if [[ "$existing_ok" -ge "$MIN_OK_THRESHOLD" ]]; then
     log "CFG $mode b=$budget SKIP (existing ok=$existing_ok >= $MIN_OK_THRESHOLD)"
     continue
   fi
@@ -120,13 +126,13 @@ for cfg in "${CONFIGS[@]}"; do
     run_one_config "$mode" "$budget" "$workers" "$batch"
     ok_count=$(count_ok "$mode" "$budget")
     log "CFG $mode b=$budget attempt=$attempt RESULT ok=$ok_count threshold=$MIN_OK_THRESHOLD"
-    if [ "$ok_count" -ge "$MIN_OK_THRESHOLD" ]; then
+    if [[ "$ok_count" -ge "$MIN_OK_THRESHOLD" ]]; then
       log "CFG $mode b=$budget OK (ok=$ok_count, attempt=$attempt)"
       break
     fi
     log "CFG $mode b=$budget BELOW THRESHOLD (ok=$ok_count) — escalating to next tier"
   done
-  if [ "$ok_count" -lt "$MIN_OK_THRESHOLD" ]; then
+  if [[ "$ok_count" -lt "$MIN_OK_THRESHOLD" ]]; then
     FAILED+=("$mode b=$budget ok=$ok_count")
     log "CFG $mode b=$budget FAILED ALL TIERS (ok=$ok_count)"
   fi