From f72ff0f44a4653d37f0153bfeefed38207ac92eb Mon Sep 17 00:00:00 2001 From: paukstelis Date: Tue, 28 Nov 2023 10:32:32 -0500 Subject: [PATCH] don't add cameras if using camera-streamer (#133) --- cameras.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/cameras.sh b/cameras.sh index e8add56..98f5a8f 100755 --- a/cameras.sh +++ b/cameras.sh @@ -45,7 +45,7 @@ write_camera() { get_settings if [ -z "$STREAMER" ]; then - STREAMER="mjpg-streamer" + STREAMER="ustreamer" fi if [ -n "$BYIDCAM" ] && [ -z "$CAM" ] && [ -z "$TEMPUSBCAM" ]; then @@ -141,6 +141,15 @@ add_camera() { INUM='' CAMHAPROX='' get_settings + + if [ "$STREAMER" == camera-streamer ]; then + echo "You are using OctoPi with camera-streamer." + echo "This is not compatible with octoprint_deploy." + echo "Use the camera-streamer scripts to install your cameras," + echo "or change the streamer type in the Utilties menu." + main_menu + fi + if [ $SUDO_USER ]; then user=$SUDO_USER; fi echo 'Adding camera' | log if [ -z "$INSTANCE" ]; then