diff --git a/misc/api.func b/misc/api.func index 1cf9ab3f4..a703cd5ca 100644 --- a/misc/api.func +++ b/misc/api.func @@ -335,7 +335,7 @@ detect_gpu() { GPU_PASSTHROUGH="unknown" local gpu_line - gpu_line=$(lspci 2>/dev/null | grep -iE "VGA|3D|Display" | head -1 || true) + gpu_line=$(lspci 2>/dev/null | grep -iE "VGA|3D|Display" | head -1) if [[ -n "$gpu_line" ]]; then # Extract model: everything after the colon, clean up @@ -374,7 +374,7 @@ detect_cpu() { if [[ -f /proc/cpuinfo ]]; then local vendor_id - vendor_id=$(grep -m1 "vendor_id" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | tr -d ' ' || true) + vendor_id=$(grep -m1 "vendor_id" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | tr -d ' ') case "$vendor_id" in GenuineIntel) CPU_VENDOR="intel" ;; @@ -388,7 +388,7 @@ detect_cpu() { esac # Extract model name and clean it up - CPU_MODEL=$(grep -m1 "model name" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ *//' | sed 's/(R)//g' | sed 's/(TM)//g' | sed 's/ */ /g' | cut -c1-64 || true) + CPU_MODEL=$(grep -m1 "model name" /proc/cpuinfo 2>/dev/null | cut -d: -f2 | sed 's/^ *//' | sed 's/(R)//g' | sed 's/(TM)//g' | sed 's/ */ /g' | cut -c1-64) fi export CPU_VENDOR CPU_MODEL @@ -407,19 +407,14 @@ detect_ram() { if command -v dmidecode &>/dev/null; then # Get configured memory speed (actual running speed) - RAM_SPEED=$(dmidecode -t memory 2>/dev/null | grep -m1 "Configured Memory Speed:" | grep -oE "[0-9]+" | head -1 || true) + RAM_SPEED=$(dmidecode -t memory 2>/dev/null | grep -m1 "Configured Memory Speed:" | grep -oE "[0-9]+" | head -1) # Fallback to Speed: if Configured not available if [[ -z "$RAM_SPEED" ]]; then - RAM_SPEED=$(dmidecode -t memory 2>/dev/null | grep -m1 "Speed:" | grep -oE "[0-9]+" | head -1 || true) + RAM_SPEED=$(dmidecode -t memory 2>/dev/null | grep -m1 "Speed:" | grep -oE "[0-9]+" | head -1) fi fi - # Ensure RAM_SPEED is a valid integer (PocketBase stores it as integer) - if [[ -z "$RAM_SPEED" || ! "$RAM_SPEED" =~ ^[0-9]+$ ]]; then - RAM_SPEED=0 - fi - export RAM_SPEED } @@ -514,7 +509,7 @@ post_to_api() { "gpu_vendor": "${gpu_vendor}", "gpu_model": "${gpu_model}", "gpu_passthrough": "${gpu_passthrough}", - "ram_speed": ${ram_speed:-0}, + "ram_speed": "${ram_speed}", "repo_source": "${REPO_SOURCE}" } EOF @@ -618,7 +613,7 @@ post_to_api_vm() { "gpu_vendor": "${gpu_vendor}", "gpu_model": "${gpu_model}", "gpu_passthrough": "${gpu_passthrough}", - "ram_speed": ${ram_speed:-0}, + "ram_speed": "${ram_speed}", "repo_source": "${REPO_SOURCE}" } EOF @@ -752,7 +747,7 @@ post_update_to_api() { "gpu_vendor": "${gpu_vendor}", "gpu_model": "${gpu_model}", "gpu_passthrough": "${gpu_passthrough}", - "ram_speed": ${ram_speed:-0}, + "ram_speed": "${ram_speed}", "repo_source": "${REPO_SOURCE}" } EOF @@ -794,7 +789,7 @@ EOF "gpu_vendor": "${gpu_vendor}", "gpu_model": "${gpu_model}", "gpu_passthrough": "${gpu_passthrough}", - "ram_speed": ${ram_speed:-0}, + "ram_speed": "${ram_speed}", "repo_source": "${REPO_SOURCE}" } EOF @@ -891,7 +886,7 @@ categorize_error() { # Signal/Process errors (SIGTERM, SIGPIPE, SIGSEGV) 139 | 141 | 143) echo "signal" ;; - # Shell errors (general error, syntax error) + # Shell errors (general error, syntax error) 1 | 2) echo "shell" ;; # Default - truly unknown