fix: adapt for bookworm & OctoPi 1.1.0

Author: foosel

scripts/02-update-octoprint

@@ -8,14 +8,18 @@ install_cleanup_trap
 
 BUNDLED="OctoPrint-FileCheck OctoPrint-FirmwareCheck OctoPrint-PiSupport"
 
+USER=pi
+VENV=/opt/octopi/oprint
+[ -f $VENV ] || VENV=/home/pi/oprint
+
 if [ -n "$OCTOPRINT_VERSION" ]; then
     # fetch from GitHub since PyPI might not yet be synced through right after a fresh release
-    sudo -u pi /home/pi/oprint/bin/pip install -U https://github.com/OctoPrint/OctoPrint/archive/refs/tags/$OCTOPRINT_VERSION.zip $BUNDLED
+    sudo -u $USER $VENV/bin/pip install -U https://github.com/OctoPrint/OctoPrint/archive/refs/tags/$OCTOPRINT_VERSION.zip $BUNDLED
 else
-    sudo -u pi /home/pi/oprint/bin/pip install -U OctoPrint $BUNDLED
+    sudo -u $USER $VENV/bin/pip install -U OctoPrint $BUNDLED
 fi
 
 # make sure to mark the file check wizard as seen
 if [ $(/usr/local/bin/yq '.server.seenWizards.file_check' /home/pi/.octoprint/config.yaml) == "null" ]; then
-    sudo -u pi FILECHECK_WIZARD=$(sudo -u pi /home/pi/oprint/bin/python -c "import octoprint_file_check; print(octoprint_file_check.WIZARD_VERSION)") /usr/local/bin/yq -i '.server.seenWizards.file_check = env(FILECHECK_WIZARD)' /home/pi/.octoprint/config.yaml
+    sudo -u $USER FILECHECK_WIZARD=$(sudo -u $USER $VENV/bin/python -c "import octoprint_file_check; print(octoprint_file_check.WIZARD_VERSION)") /usr/local/bin/yq -i '.server.seenWizards.file_check = env(FILECHECK_WIZARD)' /home/pi/.octoprint/config.yaml
 fi

scripts/03-update-boot

@@ -6,7 +6,7 @@ export LC_ALL=C
 source /common.sh
 install_cleanup_trap
 
-apt-get install --yes --reinstall raspberrypi-bootloader raspberrypi-kernel
+apt-get install --yes raspberrypi-bootloader raspberrypi-kernel
 
 kernel_version=$(dpkg -s raspberrypi-kernel | grep -i version | awk '{print $2}')
 if [ "$kernel_version" = "1:1.20230317-1" ]; then

scripts/81-fix-octopi-txt

@@ -10,6 +10,6 @@ install_cleanup_trap
 [ -f /opt/mjpg-streamer/input_raspi.so ] && exit 0
 
 # if we already have the octopi.txt file updated, we don't need to do anything
-grep -q '### Configure which camera to use' /boot/octopi.txt || exit 0
+grep -q '### Configure which camera to use' $BOOT_PATH/octopi.txt || exit 0
 
-cp /files/octopi.txt /boot/octopi.txt
+cp /files/octopi.txt $BOOT_PATH/octopi.txt

scripts/82-fix-welcome-banner

@@ -6,7 +6,10 @@ export LC_ALL=C
 source /common.sh
 install_cleanup_trap
 
-# if we already have the octopi.txt file updated, we don't need to do anything
+# if there's no welcome script at /home/pi/scripts/welcome, we don't need to do anything
+[ ! -f '/home/pi/scripts/welcome' ] && exit 0
+
+# if we already have the file updated, we don't need to do anything
 grep -q 'from octoprint._version import' /home/pi/scripts/welcome || exit 0
 
 sed -i 's#^_OCTOPRINT_VERSION=.*$#_OCTOPRINT_VERSION=$($HOME/oprint/bin/python -c "from octoprint.util.version import get_octoprint_version_string; print(get_octoprint_version_string())" || echo "unknown")#' /home/pi/scripts/welcome