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

don't add cameras if using camera-streamer (#133)

Browse Source
This commit is contained in:
paukstelis
2023-11-28 10:32:32 -05:00
committed by GitHub
parent e43bf5c13f
commit f72ff0f44a
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cameras.sh
View File

@@ -45,7 +45,7 @@ write_camera() {
get_settings get_settings
if [ -z "$STREAMER" ]; then if [ -z "$STREAMER" ]; then
STREAMER="mjpg-streamer" STREAMER="ustreamer"
fi fi
if [ -n "$BYIDCAM" ] && [ -z "$CAM" ] && [ -z "$TEMPUSBCAM" ]; then if [ -n "$BYIDCAM" ] && [ -z "$CAM" ] && [ -z "$TEMPUSBCAM" ]; then
@@ -141,6 +141,15 @@ add_camera() {
INUM='' INUM=''
CAMHAPROX='' CAMHAPROX=''
get_settings 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 if [ $SUDO_USER ]; then user=$SUDO_USER; fi
echo 'Adding camera' | log echo 'Adding camera' | log
if [ -z "$INSTANCE" ]; then if [ -z "$INSTANCE" ]; then