diff --git a/config.basic b/config.basic index bfc4c01..deab693 100644 --- a/config.basic +++ b/config.basic @@ -9,4 +9,5 @@ server: commands: serverRestartCommand: sudo systemctl restart INSTANCE systemRestartCommand: sudo reboot + systemShutdownCommand: sudo shutdown -n now firstRun: true diff --git a/octoprint_deploy.sh b/octoprint_deploy.sh index 403fdbb..1295bca 100755 --- a/octoprint_deploy.sh +++ b/octoprint_deploy.sh @@ -266,7 +266,7 @@ new_instance () { sed -i "s/upnpUuid: .*/upnpUuid: $(uuidgen)/" $OCTOCONFIG/.$INSTANCE/config.yaml #Set port sed -i "/serial:/a\ port: /dev/octo_$INSTANCE" $OCTOCONFIG/.$INSTANCE/config.yaml - + if [[ -n $CAM || -n $USBCAM ]]; then write_camera fi @@ -386,7 +386,7 @@ add_camera() { done fi - if [ "$camopt" == generic]; then + if [ "$camopt" == generic ]; then echo "Don't add cameras to the generic instance." main_menu fi