Fix six bugs found in final audit

montage-mvt.sh, year-end-join.sh: CAM_NAME fallback referenced undefined
\$CAM_NAME — crashes under set -euo pipefail on manual runs without args.
Fixed to fall back to \$SUNRISE_CAM (same fix applied earlier to other scripts).

notify.sh: Mattermost notification guard only checked MM_NOTIFY_CHANNEL_ID,
not mattermost_url or access_token. If those are unset, curl would send a
malformed request silently. Added guards for all three required values.

install.sh: seasons/fullday service units had literal \n in After=/Wants=
lines because bash does not interpret \n in heredoc variable expansions.
Changed to \$'...' syntax so actual newlines are written, making valid
systemd unit files. Also: audio capture timer now uses \$SCHEDULE_SUNRISE
instead of hardcoded 03:00, keeping it in sync if the user changes the
schedule.

sunrise-audio-capture.sh: record_start_sec could theoretically go negative
(sunrise very early + large SUNRISE_TARGET_SECS). Added floor-at-zero guard.

daily_sunrise_video.sh: added comment explaining why audio_offset is always 0.

README.md: fix CAM_RTSP_sunrise example to CAM_RTSP_east.

https://claude.ai/code/session_01C4jbd3waXG3eKZYbGUjLUQ
This commit is contained in:
Claude
2026-04-20 01:01:25 +00:00
parent 64cec6b769
commit 8b9ad74c58
7 changed files with 10 additions and 8 deletions
+1 -1
View File
@@ -72,7 +72,7 @@ $EDITOR .env
```bash
# RTSP stream URL — one per camera (variable name matches camera name)
CAM_RTSP_sunrise=rtsp://admin:password@192.168.1.100:554/stream1
CAM_RTSP_east=rtsp://admin:password@192.168.1.100:554/stream1
# Mattermost upload
mattermost_url=https://your-mattermost.example.com
+1 -1
View File
@@ -168,7 +168,7 @@ fade_out=$(echo "scale=1; $SUNRISE_TARGET_SECS - 0.5" | bc)
# ── Pick audio source ─────────────────────────────────────────────────────────
audio_src=""
audio_offset="0"
audio_offset="0" # cam audio is pre-centred on sunrise; library files are trimmed to fit
cam_audio="$image_dir/sunrise-audio.m4a"
if [ "${AUDIO_ENABLED:-false}" = "true" ]; then
+4 -3
View File
@@ -144,14 +144,15 @@ EOF
done
# ── Sunrise audio capture ─────────────────────────────────────────────────────
# Triggered at 03:00; waits internally until the right time before recording.
# Uses the same schedule as the sunrise video — both start early and wait
# internally for the right moment, so they don't interfere.
if [ "${AUDIO_ENABLED:-false}" = "true" ]; then
write_service "sky-cam-audio-capture" \
"$SUNRISE_CAM: sunrise audio capture" \
"sunrise-audio-capture.sh"
write_timer "sky-cam-audio-capture" \
"$SUNRISE_CAM: sunrise audio capture" \
"03:00:00"
"$SCHEDULE_SUNRISE"
timers+=("sky-cam-audio-capture")
fi
@@ -166,7 +167,7 @@ for cam in "${CAMERAS[@]}"; do
write_service "sky-cam-seasons-${cam}" \
"${cam}: Four Seasons daily clip" \
"4-seasons.sh ${cam}" \
"After=network-online.target\nWants=network-online.target\n"
$'After=network-online.target\nWants=network-online.target\n'
write_timer "sky-cam-seasons-${cam}" "${cam}: Four Seasons daily clip" \
"${!sched_seasons_var}"
timers+=("sky-cam-seasons-${cam}")
+1 -1
View File
@@ -24,7 +24,7 @@ export TIMEZONE # make it visible to season_info.py subprocess
# Args: [date] [camera-name]
# Camera name: second argument overrides conf (passed through from 4-seasons.sh).
CAM_NAME="${2:-$CAM_NAME}"
CAM_NAME="${2:-$SUNRISE_CAM}"
# ── Configuration ──────────────────────────────────────────────────────────────
base_dir="$BASE_DIR"
+1 -1
View File
@@ -52,7 +52,7 @@ fi
# ── Mattermost text post ──────────────────────────────────────────────────────
# mattermost_url and access_token come from sky-cam.conf (sourced above).
if [ "$MM_NOTIFY_ENABLED" = "true" ] && [ -n "$MM_NOTIFY_CHANNEL_ID" ]; then
if [ "$MM_NOTIFY_ENABLED" = "true" ] && [ -n "$MM_NOTIFY_CHANNEL_ID" ] && [ -n "${mattermost_url:-}" ] && [ -n "${access_token:-}" ]; then
curl -s \
-H "Authorization: Bearer $access_token" \
-H "Content-Type: application/json" \
+1
View File
@@ -49,6 +49,7 @@ sunrise_sec=$(time_to_seconds "$sunrise_time_local")
half_pre=$(( SUNRISE_TARGET_SECS / 2 )) # floor — pre-sunrise portion
half_post=$(( SUNRISE_TARGET_SECS - half_pre )) # ceil — post-sunrise gets odd second
record_start_sec=$(( sunrise_sec - half_pre ))
[ "$record_start_sec" -lt 0 ] && record_start_sec=0
record_dur_sec=$SUNRISE_TARGET_SECS
echo "Audio window: ${half_pre}s before → ${half_post}s after sunrise (${record_dur_sec}s total)"
+1 -1
View File
@@ -21,7 +21,7 @@ if [ -z "$ASTRO_YEAR" ]; then
exit 1
fi
# Camera name: second argument overrides conf (passed through from montage-mvt.sh).
CAM_NAME="${2:-$CAM_NAME}"
CAM_NAME="${2:-$SUNRISE_CAM}"
year_dir="$MOVIES_DIR/$CAM_NAME/$ASTRO_YEAR"