From 1c77eada39ef7eab1bed99aa3f059834338441ce Mon Sep 17 00:00:00 2001
From: paukstelis <paukstel@umd.edu>
Date: Wed, 28 Feb 2024 14:50:42 -0500
Subject: [PATCH] fix for ustreamer being changed to ustreamer.bin

---
 README.md  | 4 ++--
 menu.sh    | 2 +-
 prepare.sh | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 75c9298..3e8a9d2 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ Updated January 19, 2024.
 Want to support this work? Buy Me a Coffee. https://www.buymeacoffee.com/ppaukstelis.
 Need help with octoprint_deploy? Visit support-octoprint-deploy on the OctoPrint Discord: https://discord.com/invite/yA7stPp
 
-# octoprint_deploy 1.0.7
+# octoprint_deploy 1.0.9
 
 * These files provide a bash script for quickly deploying multiple octoprint instances on a single computer. For Linux systems (Ubuntu, Fedora, etc.) it will also install OctoPrint and a video streamer (ustreamer). No need for lots of file editing or complicated Docker compose scripts! A background video on how it generally works from my ERRF2022 talk can be found here: https://www.youtube.com/watch?v=q0iCNl8-kJI&t=15378s
 * octoprint_deploy and octoprint_install are being merged! Maintaining two separate scripts was close to twice the amount of work. By merging the scripts many new features have been included, while also providing greater simplicity in setup. 
@@ -63,7 +63,7 @@ Need help with octoprint_deploy? Visit support-octoprint-deploy on the OctoPrint
   * Restart all instances from the command line: `sudo octoprint_deploy/octoprint_deploy.sh restart_all`
   * You can inject any function at start using the command line with the first argument `f` and the second argument the function name. 
 # Recent Changes
-
+  * Fix change for ustreamer executable being renamed ustreamer.bin
   * Improve Instance Status function.
   * Remove octoprint_deploy backup technique and move entirely to native OctoPrint backups. Backups made in this way are moved to /home/$USER/instance_backup to make them easier to sort.
   * Camera settings written to separate env file. This can be found and edited at `/etc/cam_instancename.env`. 
diff --git a/menu.sh b/menu.sh
index 45d7605..28989e4 100644
--- a/menu.sh
+++ b/menu.sh
@@ -9,7 +9,7 @@ yellow=$(echo -en "\e[93m")
 
 main_menu() {
 
-    VERSION=1.0.7
+    VERSION=1.0.9
     #reset
     UDEV=''
     TEMPUSB=''
diff --git a/prepare.sh b/prepare.sh
index bd7ec3d..ee0b8c8 100644
--- a/prepare.sh
+++ b/prepare.sh
@@ -436,7 +436,7 @@ streamer_install() {
         #install ustreamer
         sudo -u $user git -C /home/$user clone --depth=1 https://github.com/pikvm/ustreamer
         sudo -u $user make -C /home/$user/ustreamer > /dev/null
-        if [ -f "/home/$user/ustreamer/ustreamer" ]; then
+        if [ -f "/home/$user/ustreamer/ustreamer" ] || [ -f "/home/$user/ustreamer/ustreamer.bin" ]; then
             echo "Streamer installed successfully"
         else
             echo "${red}WARNING! WARNING! WARNING!${white}"
@@ -445,6 +445,9 @@ streamer_install() {
                 streamer_install
             fi
         fi
+        if [ -f "/home/$user/ustreamer/ustreamer.bin" ]; then
+            sudo -u $user ln -s /home/$user/ustreamer/ustreamer.bin /home/$user/ustreamer/ustreamer
+        fi
         echo 'streamer: ustreamer' >> /etc/octoprint_deploy
     fi