fix(date): improve cross-platform date command compatibility

Fixes date command errors on macOS with Homebrew GNU coreutils:
- 'date: invalid option -- v' when GNU date runs BSD syntax
- 'syntax error in expression' when stat returns filesystem metadata

Changes:
- Replace uname-based detection with capability detection (try/fallback)
- Try GNU commands first, fall back to BSD, then ultimate fallbacks
- Add date -r fallback for file mtime (most portable)

This handles mixed environments where uname returns "Darwin" but
GNU coreutils are in PATH from Homebrew.

Credit: @farce1 (PR #119)
This commit is contained in:
Test User 2026-02-02 09:39:39 -07:00
parent c05499c176
commit 3ed0a9d9ff
2 changed files with 32 additions and 27 deletions

View file

@ -5,33 +5,33 @@
# Get current timestamp in ISO 8601 format with seconds precision # Get current timestamp in ISO 8601 format with seconds precision
# Returns: YYYY-MM-DDTHH:MM:SS+00:00 format # Returns: YYYY-MM-DDTHH:MM:SS+00:00 format
# Uses capability detection instead of uname to handle macOS with Homebrew coreutils
get_iso_timestamp() { get_iso_timestamp() {
local os_type # Try GNU date first (works on Linux and macOS with Homebrew coreutils)
os_type=$(uname) local result
if result=$(date -u -Iseconds 2>/dev/null) && [[ -n "$result" ]]; then
if [[ "$os_type" == "Darwin" ]]; then echo "$result"
# macOS (BSD date) return
# Use manual formatting and add colon to timezone offset
date -u +"%Y-%m-%dT%H:%M:%S%z" | sed 's/\(..\)$/:\1/'
else
# Linux (GNU date) - use -u flag for UTC
date -u -Iseconds
fi fi
# Fallback to BSD date (native macOS) - add colon to timezone offset
date -u +"%Y-%m-%dT%H:%M:%S%z" | sed 's/\(..\)$/:\1/'
} }
# Get time component (HH:MM:SS) for one hour from now # Get time component (HH:MM:SS) for one hour from now
# Returns: HH:MM:SS format # Returns: HH:MM:SS format
# Uses capability detection instead of uname to handle macOS with Homebrew coreutils
get_next_hour_time() { get_next_hour_time() {
local os_type # Try GNU date first (works on Linux and macOS with Homebrew coreutils)
os_type=$(uname) if date -d '+1 hour' '+%H:%M:%S' 2>/dev/null; then
return
if [[ "$os_type" == "Darwin" ]]; then
# macOS (BSD date) - use -v flag for date arithmetic
date -v+1H '+%H:%M:%S'
else
# Linux (GNU date) - use -d flag for date arithmetic
date -d '+1 hour' '+%H:%M:%S'
fi fi
# Fallback to BSD date (native macOS)
if date -v+1H '+%H:%M:%S' 2>/dev/null; then
return
fi
# Ultimate fallback - compute using epoch arithmetic
local future_epoch=$(($(date +%s) + 3600))
date -r "$future_epoch" '+%H:%M:%S' 2>/dev/null || date '+%H:%M:%S'
} }
# Get current timestamp in a basic format (fallback) # Get current timestamp in a basic format (fallback)

View file

@ -626,16 +626,21 @@ get_session_file_age_hours() {
return return
fi fi
local os_type # Get file modification time using capability detection
os_type=$(uname) # Handles macOS with Homebrew coreutils where stat flags differ
local file_mtime local file_mtime
if [[ "$os_type" == "Darwin" ]]; then
# macOS (BSD stat) # Try GNU stat first (Linux, macOS with Homebrew coreutils)
file_mtime=$(stat -f %m "$file" 2>/dev/null) if file_mtime=$(stat -c %Y "$file" 2>/dev/null) && [[ -n "$file_mtime" && "$file_mtime" =~ ^[0-9]+$ ]]; then
: # success
# Try BSD stat (native macOS)
elif file_mtime=$(stat -f %m "$file" 2>/dev/null) && [[ -n "$file_mtime" && "$file_mtime" =~ ^[0-9]+$ ]]; then
: # success
# Fallback to date -r (most portable)
elif file_mtime=$(date -r "$file" +%s 2>/dev/null) && [[ -n "$file_mtime" && "$file_mtime" =~ ^[0-9]+$ ]]; then
: # success
else else
# Linux (GNU stat) file_mtime=""
file_mtime=$(stat -c %Y "$file" 2>/dev/null)
fi fi
# Handle stat failure - return -1 to indicate error # Handle stat failure - return -1 to indicate error