Merge branch 'main' into camera-streamer

.github/workflows/custopize.yml

@@ -30,7 +30,7 @@ jobs:
       uses: actions/checkout@v4
 
     - name: "🔎 Determine OctoPi version"
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       with:
         script: |
           let release = null;
@@ -163,6 +163,7 @@ jobs:
 
           * OctoPi ${{ env.OCTOPI_VERSION }}
           * OctoPrint ${{ env.OCTOPRINT_VERSION }}
+          * Latest versions of the bundled OctoPrint plugins
           * Latest kernel & bootloader
           * Latest libcamera-apps
           * New camera-streamer based webcam stack
@@ -257,7 +258,7 @@ jobs:
     environment: live
     steps:
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         name: "✔ Mark release as tested"
         env:
           TAG: "${{ needs.build.outputs.tag }}"

scripts/01-add-yq

@@ -0,0 +1,13 @@
+set -x
+set -e
+
+export LC_ALL=C
+
+source /common.sh
+install_cleanup_trap
+
+# if pb is there, we don't need to do anything
+[ -f /usr/local/bin/yq ] && exit 0
+
+curl -L -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/v4.43.1/yq_linux_arm
+chmod +x /usr/local/bin/yq

scripts/02-update-octoprint

@@ -14,3 +14,8 @@ if [ -n "$OCTOPRINT_VERSION" ]; then
 else
     sudo -u pi /home/pi/oprint/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
+fi