voltron/octodocker_deploy
1
0
Fork 0
Code Issues Pull Requests Releases Activity

terminate early if no SN

Browse Source
This commit is contained in:
paukstelis
2022-09-28 19:18:48 -04:00
parent ef5722dbe6
commit bb541cefb0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
octoprint_deploy.sh
View File

@@ -193,7 +193,7 @@ new_instance () {
main_menu main_menu
fi fi
else else
echo -e "Serial number detected as: \033[0;34m $UDEV\033[0m" | log echo -e "Serial number detected as: $UDEV" | log
check_sn "$UDEV" check_sn "$UDEV"
echo echo
fi fi
@@ -388,9 +388,12 @@ add_camera() {
CAM=$(timeout 1s dmesg -w | sed -n -e 's/^.*SerialNumber: //p') CAM=$(timeout 1s dmesg -w | sed -n -e 's/^.*SerialNumber: //p')
TEMPUSBCAM=$(timeout 1s dmesg -w | sed -n -e 's|^.*input:.*/\(.*\)/input/input.*|\1|p') TEMPUSBCAM=$(timeout 1s dmesg -w | sed -n -e 's|^.*input:.*/\(.*\)/input/input.*|\1|p')
counter=$(( $counter + 1 )) counter=$(( $counter + 1 ))
if [[ -n "$TEMPUSBCAM" ]] && [[ -z "$CAM" ]]
break
fi
done done
#Failed state. Nothing detected #Failed state. Nothing detected
if [ -z "$CAM" ] && [ -z "$TEMPUSBCAM" ]; then if [ -z "$CAM" ] && [ -z "$TEMPUSBCAM" ] ; then
echo echo
echo -e "\033[0;31mNo camera was detected during the detection period.\033[0m" echo -e "\033[0;31mNo camera was detected during the detection period.\033[0m"
echo echo
@@ -468,6 +471,10 @@ detect_printer() {
sleep 1 sleep 1
fi fi
counter=$(( $counter + 1 )) counter=$(( $counter + 1 ))
#No need to complete timeout in this case
if [[ -n "$TEMPUSB" ]] && [[ -z "$UDEV" ]]
break
fi
done done
} }