fix: fixes error in detect_legacy (mainsail-crew#217)

This will fix issue on Raspberry Pi5, which doesnt generate cam list, because 'vcgencmd get_camera' exits with an error. If all conditions fail it will always return '0' Signed-off-by: Stephan Wendel <[email protected]>
mryel00 · Dec 14, 2023 · 61421f5 · 61421f5
1 parent 43a1ee3
commit 61421f5
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/libs/hwhandler.sh b/libs/hwhandler.sh
@@ -86,13 +86,16 @@ get_libcamera_path() {
 # Determine connected "legacy" device
 function detect_legacy {
     local avail
-    if [[ -f /proc/device-tree/model ]] &&
-    grep -q "Raspberry" /proc/device-tree/model; then
-        avail="$(vcgencmd get_camera | awk -F '=' '{ print $3 }' | cut -d',' -f1)"
-    else
-        avail="0"
+    if [[ "$(is_raspberry_pi)" = "1" ]] &&
+    command -v vcgencmd &> /dev/null; then
+        if vcgencmd get_camera &> /dev/null ; then
+            avail="$(vcgencmd get_camera \
+                    | awk -F '=' '{ print $3 }' \
+                    | cut -d',' -f1 \
+                    )"
+        fi
     fi
-    echo "${avail}"
+    echo "${avail:-0}"
 }
 
 function dev_is_legacy {