From c1d0f295e257fb82da89db307deaf1089c60bd4a Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Thu, 19 May 2022 10:54:18 +0200
Subject: [PATCH] refactor(octoprint.sh): improve error handling during
 OctoPrint installation

Signed-off-by: Dominik Willner th33xitus@gmail.com
---
 scripts/octoprint.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/scripts/octoprint.sh b/scripts/octoprint.sh
index d5ef214..f8d0904 100644
--- a/scripts/octoprint.sh
+++ b/scripts/octoprint.sh
@@ -152,15 +152,21 @@ function install_octoprint() {
       return 1
     fi
 
-    cd "${tmp}" && virtualenv --python=python3 venv
+    cd "${tmp}"
 
-    ### activate virtualenv
-    source venv/bin/activate
-    pip install pip --upgrade
-    pip install --no-cache-dir octoprint
+    if virtualenv --python=python3 venv; then
+      ### activate virtualenv
+      source venv/bin/activate
+      pip install pip --upgrade
+      pip install --no-cache-dir octoprint
+      ### leave virtualenv
+      deactivate
+    else
+      log_error "failure while creating python3 OctoPrint env"
+      error_msg "Creation of OctoPrint virtualenv failed!"
+      exit 1
+    fi
 
-    ### leave virtualenv
-    deactivate
     cd "${HOME}"
   }