From 34fce88095cf27ec30424ec9a9312282ff6ce465 Mon Sep 17 00:00:00 2001
From: Cyril <guilouz6@hotmail.com>
Date: Wed, 8 May 2024 21:04:07 +0200
Subject: [PATCH] Update

---
 scripts/git_backup.sh          | 2 ++
 scripts/moonraker_obico.sh     | 2 ++
 scripts/moonraker_timelapse.sh | 2 ++
 scripts/usb_camera.sh          | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/scripts/git_backup.sh b/scripts/git_backup.sh
index 0a6ede0..5cf9dbb 100755
--- a/scripts/git_backup.sh
+++ b/scripts/git_backup.sh
@@ -82,7 +82,9 @@ function remove_git_backup(){
         fi
         if [ -f "$ENTWARE_FILE" ]; then
           echo -e "Info: Removing packages..."
+          set +e
           "$ENTWARE_FILE" --autoremove remove inotifywait
+          set -e
         fi
         if [ ! -n "$(ls -A "$HS_CONFIG_FOLDER")" ]; then
           rm -rf "$HS_CONFIG_FOLDER"
diff --git a/scripts/moonraker_obico.sh b/scripts/moonraker_obico.sh
index da8db6a..bf8a1b4 100755
--- a/scripts/moonraker_obico.sh
+++ b/scripts/moonraker_obico.sh
@@ -70,8 +70,10 @@ function remove_moonraker_obico(){
         rm -f /etc/init.d/S99moonraker_obico
         if [ -f "$ENTWARE_FILE" ]; then
           echo -e "Info: Removing packages..."
+          set +e
           "$ENTWARE_FILE" --autoremove remove python3
           "$ENTWARE_FILE" --autoremove remove python3-pip
+          set -e
         fi
         echo -e "Info: Restarting Moonraker service..."
         stop_moonraker
diff --git a/scripts/moonraker_timelapse.sh b/scripts/moonraker_timelapse.sh
index 92c1afb..b22eee0 100755
--- a/scripts/moonraker_timelapse.sh
+++ b/scripts/moonraker_timelapse.sh
@@ -70,7 +70,9 @@ function remove_moonraker_timelapse(){
         rm -f /usr/data/moonraker/moonraker/moonraker/components/timelapse.py
         rm -f /usr/data/moonraker/moonraker/moonraker/components/timelapse.pyc
         if [ -f /opt/bin/ffmpeg ]; then
+          set +e
           "$ENTWARE_FILE" --autoremove remove ffmpeg
+          set -e
         fi
         if grep -q "include Helper-Script/timelapse" "$PRINTER_CFG" ; then
           echo -e "Info: Removing Moonraker Timelapse configurations in printer.cfg file..."
diff --git a/scripts/usb_camera.sh b/scripts/usb_camera.sh
index 71852f1..8866bea 100755
--- a/scripts/usb_camera.sh
+++ b/scripts/usb_camera.sh
@@ -84,11 +84,13 @@ function remove_usb_camera(){
         echo -e "Info: Removing file..."
         rm -f "$INITD_FOLDER"/S50usb_camera
         echo -e "Info: Removing packages..."
+        set +e
         "$ENTWARE_FILE" --autoremove remove mjpg-streamer-www
         "$ENTWARE_FILE" --autoremove remove mjpg-streamer-output-http
         "$ENTWARE_FILE" --autoremove remove mjpg-streamer-input-uvc
         "$ENTWARE_FILE" --autoremove remove mjpg-streamer-input-http
         "$ENTWARE_FILE" --autoremove remove mjpg-streamer
+        set -e
         ok_msg "USB Camera Support has been removed successfully!"
         echo -e "   Please reboot your printer by using power switch on back!"
         return;;