Merge branch 'main' into camera-streamer

Author: foosel

.github/workflows/custopize.yml

@@ -248,7 +248,7 @@ jobs:
           repo: OctoPrint/devtools
           ref: main
           inputs: '{"image": "${{ needs.build.outputs.image-url }}", "target": "pic"}'
-          repost-logs: true
+          repost-logs: false
 
   deploy:
     name: "Deploy"

scripts/02-update-octoprint

@@ -6,9 +6,11 @@ export LC_ALL=C
 source /common.sh
 install_cleanup_trap
 
+BUNDLED="OctoPrint-FileCheck OctoPrint-FirmwareCheck OctoPrint-PiSupport"
+
 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
+    sudo -u pi /home/pi/oprint/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
+    sudo -u pi /home/pi/oprint/bin/pip install -U OctoPrint $BUNDLED
 fi

scripts/82-fix-welcome-banner

@@ -0,0 +1,12 @@
+set -x
+set -e
+
+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
+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