fix: align docs with code and fix ESLint quote style for CI

- Fix ESLint single-quote violations in shellQuote and rsync args
  (remotebuzzer-server.js, sync-to-drive.js) that caused CI build failure
- Add usb-sync.md to mkdocs_remote.yml navigation
- Fix socket.io command name: move2usb → start-move2usb in docs
- Remove non-existent hardware button trigger claim from Move2USB docs
- Document general_permissions() auto-installing USB mount permissions
- Clarify sudoers paths, numeric uid/gid, unmount behavior, copy.chk
  cleanup, and legacy file removal in USB Sync docs

Made-with: Cursor

Author: Photobooth

assets/js/remotebuzzer-server.js

@@ -12,7 +12,7 @@ let collageInProgress = false,
 const { execSync, spawnSync } = require('child_process');
 const { pid: PID, platform: PLATFORM } = process;
 const REARM_TIMEOUT_MS = 60000; // Fallback to re-arm trigger if no completion arrives
-const shellQuote = (s) => "'" + String(s).replace(/'/g, "'\\''") + "'";
+const shellQuote = (s) => '\'' + String(s).replace(/'/g, '\'\\\'\'') + '\'';
 
 /* LOGGING FUNCTION */
 const log = function (...optionalParams) {
@@ -750,7 +750,7 @@ function move2usbAction() {
         // First check the mountpoint from lsblk data
         if (drive.mountpoint) {
             try {
-                execSync(`mountpoint -q '${drive.mountpoint.replace(/'/g, "'\\''")}'`, { stdio: 'ignore' });
+                execSync(`mountpoint -q '${drive.mountpoint.replace(/'/g, '\'\\\'\'')}'`, { stdio: 'ignore' });
                 return drive.mountpoint;
                 // eslint-disable-next-line no-unused-vars
             } catch (err) {

assets/js/sync-to-drive.js

@@ -7,7 +7,7 @@ const { execSync, spawn } = require('child_process');
 const fs = require('fs');
 const path = require('path');
 
-const shellQuote = (s) => "'" + String(s).replace(/'/g, "'\\''") + "'";
+const shellQuote = (s) => '\'' + String(s).replace(/'/g, '\'\\\'\'') + '\'';
 
 const log = (...optionalParams) => {
     const currentDate = new Date();
@@ -126,10 +126,10 @@ class SyncToDrive {
             '-b',
             '--backup-dir=' + path.join(device.mountpoint, 'deleted'),
             '--ignore-existing',
-            "--exclude='deleted'",
-            "--include='*.'{jpg,chk,gif,mp4}",
-            "--include='*/'",
-            "--exclude='*'",
+            '--exclude=\'deleted\'',
+            '--include=\'*.\'{jpg,chk,gif,mp4}',
+            '--include=\'*/\'',
+            '--exclude=\'*\'',
             '--prune-empty-dirs',
             this.source + '/',
             destinationPath
@@ -440,7 +440,7 @@ class SyncToDrive {
         // First check the mountpoint from lsblk data
         if (device.mountpoint) {
             try {
-                execSync(`mountpoint -q '${device.mountpoint.replace(/'/g, "'\\''")}'`, { stdio: 'ignore' });
+                execSync(`mountpoint -q '${device.mountpoint.replace(/'/g, '\'\\\'\'')}'`, { stdio: 'ignore' });
 
                 return device.mountpoint;
                 // eslint-disable-next-line no-unused-vars

docs/faq/remote-button.md

@@ -60,9 +60,9 @@ Notes
 ## 3) Remote trigger via Socket.io
 
 - Channel: `photobooth-socket`
-- Commands: `start-picture`, `start-collage`, `collage-next`, `start-custom`, `start-video`, `print`, `rotary-cw`, `rotary-ccw`, `rotary-btn-press`, `move2usb`
+- Commands: `start-picture`, `start-collage`, `collage-next`, `collage-wait-for-next`, `start-custom`, `start-video`, `start-move2usb`, `print`, `rotary-cw`, `rotary-ccw`, `rotary-btn-press`, `completed`, `in-progress`
 - Response: `completed` after the workflow finishes.
-- `move2usb` copies (or moves) all photos/videos to the configured USB stick — see [USB Sync & Move2USB](usb-sync.md) for setup and permissions.
+- `start-move2usb` copies (or moves) all photos/videos to the configured USB stick — see [USB Sync & Move2USB](usb-sync.md) for setup and permissions.
 
 ## 4) Remote trigger via simple web requests (HTTP)
 

docs/faq/usb-sync.md

@@ -5,7 +5,7 @@ Photobooth offers two ways to get your photos and videos onto a USB stick:
 | Feature | Purpose | Trigger |
 |---------|---------|---------|
 | **USB Sync** | Automatic background sync at a regular interval | Runs continuously while Photobooth is open |
-| **Move2USB** | One-shot copy **or** move of all media | Manual — HTTP endpoint, socket.io command, or hardware button |
+| **Move2USB** | One-shot copy **or** move of all media | Manual — HTTP endpoint or socket.io command |
 
 Both features share the same USB device identifier (Adminpanel → **USB Sync → USB device identifier**) and the same Linux mount permissions.
 
@@ -26,7 +26,7 @@ The web-server user (`www-data`) needs permission to mount and unmount USB drive
 Photobooth ships two complementary mechanisms that are installed via the **Photobooth Setup Wizard**:
 
 1. **Polkit rule** — allows `www-data` to call `udisksctl mount` / `udisksctl unmount` without a password.
-2. **sudoers rule** (`/etc/sudoers.d/021_www-data-usb-sync`) — passwordless `sudo mount`, `sudo umount` and `sudo mkdir -p /media/*` as fallback when udisksctl is unavailable.
+2. **sudoers rule** (`/etc/sudoers.d/021_www-data-usb-sync`) — passwordless `sudo mount /dev/* /media/*`, `sudo umount /dev/*` and `sudo mkdir -p /media/*` as fallback when udisksctl is unavailable. Both `/bin` and `/usr/bin` paths are covered for portability.
 
 ### Installing via the Setup Wizard
 
@@ -45,8 +45,10 @@ The wizard will:
 
 - Install the Polkit rule for udisksctl.
 - Install the sudoers rule for mount/umount/mkdir.
-- Try to disable desktop auto-mount (pcmanfm volume handling) to avoid permission conflicts.
-- Remove any legacy `020_www-data-usb` sudoers file.
+- Disable desktop auto-mount (pcmanfm `mount_on_startup`, `mount_removable`, `autorun` in both the system default and user profile config) to avoid permission conflicts.
+- Remove any legacy `020_www-data-usb` sudoers file and `50-photobooth-udisks.rules` polkit file.
+
+**Note:** USB mount permissions are also installed automatically when running **2 Fix general permissions** or during a fresh Photobooth install. The dedicated "USB Sync policy" menu entry is only needed to re-apply or remove the rules individually.
 
 Run the same menu entry again after OS upgrades to re-apply the rules.
 
@@ -115,13 +117,12 @@ Move2USB lets you copy — or move — **all** current photos and videos to the
 
 ### Triggering Move2USB
 
-- **HTTP endpoint:** `http://<IP>:<Port>/commands/start-move2usb`
-- **Socket.io:** emit `photobooth-socket` → `move2usb`
-- **Hardware button:** assign a key code to the Move2USB action (same input-device mechanism as picture/collage/print).
+- **HTTP endpoint:** `http://<IP>:<Port>/commands/start-move2usb` — requires Hardware Buttons enabled and Move2USB mode not `disabled`.
+- **Socket.io:** emit `photobooth-socket` → `start-move2usb`
 
 ### Copy verification
 
-Move2USB creates a `copy.chk` marker file in the Photobooth data folder before rsync and expects it to appear on the USB stick after sync. If the marker is missing on the USB stick after rsync, the sync is treated as **failed** and no files are deleted (even in `move` mode).
+Move2USB creates a `copy.chk` marker file in the Photobooth data folder before rsync and expects it to appear on the USB stick after sync. If the marker is missing on the USB stick after rsync, the sync is treated as **failed** and no files are deleted (even in `move` mode). After successful verification, both the local and USB-side `copy.chk` files are cleaned up automatically.
 
 ### What gets deleted in "move" mode
 
@@ -140,12 +141,17 @@ Photobooth uses a layered approach to mount USB drives:
 2. **findmnt check** — if udisksctl output was ambiguous, verify via `findmnt`.
 3. **sudo mount** — fallback using the sudoers rule; mounts to `/media/<label>`.
 
-For **FAT32** (`vfat`) and **exFAT** volumes the mount options `umask=0000,uid=<www-data>,gid=<www-data>` are set automatically so the web-server process can write to the stick.
+For **FAT32** (`vfat`) and **exFAT** volumes the mount options `umask=0000,uid=<uid>,gid=<gid>` (using the numeric uid/gid of the running process, typically `33` for `www-data`) are set automatically so the web-server process can write to the stick.
 
 If a drive is already mounted but **not writable** (e.g. auto-mounted by the desktop with different uid/gid), Photobooth unmounts and re-mounts it with the correct options.
 
 Unmounting follows the same order: udisksctl first, `sudo umount` as fallback.
 
+**When does each feature unmount?**
+
+- **USB Sync** keeps the stick mounted between sync intervals and only unmounts on process termination (SIGTERM/SIGHUP/SIGINT).
+- **Move2USB** unmounts the stick after every sync operation (before deleting local files in `move` mode).
+
 ---
 
 ## Preparing a USB stick

mkdocs_remote.yml

@@ -47,6 +47,7 @@ nav:
     - Screensaver: faq/screensaver.md
     - Tutorials: faq/tutorials.md
     - Remote Buttons: faq/remote-button.md
+    - USB Sync & Move2USB: faq/usb-sync.md
     - Printer Troubleshooting: faq/printer-troubleshooting.md
     - gphoto2 Troubleshooting: faq/gphoto2-troubleshooting.md
     - GO2RTC Troubleshooting: faq/go2rtc-troubleshooting.md