From 374601f2faa87100fe3e49ebb068d97495d8b69e Mon Sep 17 00:00:00 2001 From: sebseb7 Date: Thu, 18 Dec 2025 14:23:38 +0100 Subject: [PATCH] refactor: Default log file path to script directory in install, config, and capture scripts. --- demo/capture-upload.sh | 2 +- demo/install.sh | 13 ++++--------- demo/picupper.conf.example | 4 ++-- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/demo/capture-upload.sh b/demo/capture-upload.sh index cf37912..67a7eed 100644 --- a/demo/capture-upload.sh +++ b/demo/capture-upload.sh @@ -33,7 +33,7 @@ VIDEO_DEVICE="${VIDEO_DEVICE:-/dev/video0}" RESOLUTION="${RESOLUTION:-1920x1080}" SKIP_FRAMES="${SKIP_FRAMES:-5}" TEMP_DIR="${TEMP_DIR:-/tmp}" -LOG_FILE="${LOG_FILE:-/var/log/picupper.log}" +LOG_FILE="${LOG_FILE:-${SCRIPT_DIR}/picupper.log}" TIMEOUT="${TIMEOUT:-30}" MAX_RETRIES="${MAX_RETRIES:-3}" RETRY_DELAY="${RETRY_DELAY:-5}" diff --git a/demo/install.sh b/demo/install.sh index c8d354f..9dbb939 100644 --- a/demo/install.sh +++ b/demo/install.sh @@ -7,7 +7,7 @@ set -euo pipefail SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" CAPTURE_SCRIPT="${SCRIPT_DIR}/capture-upload.sh" CONFIG_FILE="${SCRIPT_DIR}/picupper.conf" -LOG_FILE="/var/log/picupper.log" +LOG_FILE="${SCRIPT_DIR}/picupper.log" echo "=== PicUpper Installer ===" echo "" @@ -56,14 +56,9 @@ chmod +x "$CAPTURE_SCRIPT" chmod +x "${SCRIPT_DIR}/uninstall.sh" 2>/dev/null || true echo "✓ Scripts are executable" -# Create log file if needed -if [[ ! -f "$LOG_FILE" ]]; then - sudo touch "$LOG_FILE" - sudo chown "$USER:$USER" "$LOG_FILE" - echo "✓ Log file created: $LOG_FILE" -else - echo "✓ Log file exists: $LOG_FILE" -fi +# Touch log file to ensure it exists +touch "$LOG_FILE" 2>/dev/null || true +echo "✓ Log file: $LOG_FILE" # Set up cron job CRON_JOB="* * * * * $CAPTURE_SCRIPT >> $LOG_FILE 2>&1" diff --git a/demo/picupper.conf.example b/demo/picupper.conf.example index f2c39c8..8f219fa 100644 --- a/demo/picupper.conf.example +++ b/demo/picupper.conf.example @@ -34,8 +34,8 @@ SKIP_FRAMES=5 # Temporary file location TEMP_DIR="/tmp" -# Log file location -LOG_FILE="/var/log/picupper.log" +# Log file location (default: same directory as script) +LOG_FILE="" # Connection timeout in seconds TIMEOUT=30