From 66de13b14fc28c1347d79a1ac2b4a257edaa1bf1 Mon Sep 17 00:00:00 2001
From: paukstelis <paukstel@umd.edu>
Date: Sun, 14 May 2023 10:26:35 -0400
Subject: [PATCH] Install check (#86)

* install check

* install check, no cloud
---
 README.md           |  4 +++-
 octoprint_deploy.sh | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 47da92f..ac04d74 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-Updated April 15, 2023.  
+Updated May 14, 2023.  
 Want to support this work? Buy Me a Coffee. https://www.buymeacoffee.com/ppaukstelis.
 Need help with octoprint_deploy? Ask on Discord: https://discord.gg/6vgSjgvR6u
 # octoprint_deploy
@@ -60,6 +60,8 @@ These files provide a bash script for quickly deploying multiple octoprint insta
   * Change udev rules for an instance with `sudo octoprint_deploy/octoprint_deploy.sh replace`
   * Always a good idea to update octoprint_deploy from time-to-time with `git -C octoprint_deploy pull`
 # Recent Changes
+* Remove cloud plugin setup for template. This causes more issues than it helps. Cloud plugins should typically be installed manually and configured for each instance.
+* Verify that OctoPrint gets installed in virtual environment. Opens remove_everything prompt of executable does not exist.
 * Remove path double slashes that seemed to prevented deletion of timelapse videos.
 * Check for spaces in instance name, admin user, and password
 * Force camera port to be greater than 7000
diff --git a/octoprint_deploy.sh b/octoprint_deploy.sh
index 00f7fa0..5f364a9 100755
--- a/octoprint_deploy.sh
+++ b/octoprint_deploy.sh
@@ -285,6 +285,7 @@ new_instance () {
         $DAEMONPATH --basedir $OCTOCONFIG/.$INSTANCE config set plugins.errortracking.unique_id $(uuidgen)
         $DAEMONPATH --basedir $OCTOCONFIG/.$INSTANCE config set plugins.tracking.unique_id $(uuidgen)
         $DAEMONPATH --basedir $OCTOCONFIG/.$INSTANCE config set serial.port /dev/octo_$INSTANCE
+        $DAEMONPATH --basedir $OCTOCONFIG/.$INSTANCE config set webcam.ffmpeg /usr/bin/ffmpeg
         
         if [ "$HAPROXY" == true ]; then
             HAversion=$(haproxy -v | sed -n 's/^.*version \([0-9]\).*/\1/p')
@@ -815,6 +816,18 @@ prepare () {
             sudo -u $user /home/$user/OctoPrint/bin/pip install wheel
             #install oprint
             sudo -u $user /home/$user/OctoPrint/bin/pip install OctoPrint
+
+            #NEW! Do check to verify that OctoPrint binary is installed
+            if [ -f "/home/$user/OctoPrint/bin/octoprint" ]; then
+                echo "OctoPrint apppears to have been installed successfully"
+            else
+                echo "WARNING! WARNING! WARNING!"
+                echo "OctoPrint has not been installed correctly."
+                echo "Please answer Y to remove everything and try running prepare system again."
+                remove_everything
+                exit
+            fi
+
             #start server and run in background
             echo 'Creating generic OctoPrint template service...'
             cat $SCRIPTDIR/octoprint_generic.service | \
@@ -930,9 +943,9 @@ prepare () {
             fi
             echo
             echo
-            if prompt_confirm "Would you like to install cloud service plugins now?"; then
-                plugin_menu_cloud
-            fi
+            #if prompt_confirm "Would you like to install cloud service plugins now?"; then
+            #    plugin_menu_cloud
+            #fi
             #this restart seems necessary in some cases
             systemctl restart octoprint_default.service
         fi