From a15af4964b5c0d62cea0c203c8db8e66424a8d5b Mon Sep 17 00:00:00 2001 From: Federico Justus Denkena Date: Thu, 10 Sep 2026 00:40:03 +0200 Subject: [PATCH] linux: assume DataStorage already mounted at ~/DataStorage No LABEL/findmnt probe. Dropbox and workdir live under that tree. --- README.md | 5 ++--- config.example.json | 4 ++-- linux/install.sh | 31 +++++++------------------------ 3 files changed, 11 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index f6b9c48..c3da66e 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,8 @@ rclone-dropbox-bisync ==================== -NTFS volume label DataStorage (Windows D:), folder Dropbox. -Local path: D:\Dropbox / /Dropbox -Workdir: D:\rclone-bisync (created if missing) +Windows: D: (DataStorage) \Dropbox, workdir D:\rclone-bisync +Linux: ~/DataStorage already mounted; Dropbox + workdir under that. Windows (paste in PowerShell): diff --git a/config.example.json b/config.example.json index 2f5a8f7..6017ae2 100644 --- a/config.example.json +++ b/config.example.json @@ -1,8 +1,8 @@ { "enabled": true, - "path1": "/mnt/DataStorage/Dropbox", + "path1": "~/DataStorage/Dropbox", "path2": "dropbox:", - "workdir": "/mnt/DataStorage/rclone-bisync", + "workdir": "~/DataStorage/rclone-bisync", "interval_minutes": 15, "rclone": "rclone", "check_filename": "RCLONE_TEST" diff --git a/linux/install.sh b/linux/install.sh index 774aeb2..d1711a4 100755 --- a/linux/install.sh +++ b/linux/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash # rclone-dropbox-bisync Linux setup -# Dual-boot: NTFS volume labeled DataStorage, Dropbox at /Dropbox +# Dual-boot: DataStorage already mounted at ~/DataStorage # Paste: curl -fsSL https://git.denkena-consulting.com/f-denkena/rclone-dropbox-bisync/raw/branch/master/linux/install.sh | bash set -euo pipefail @@ -12,24 +12,6 @@ BIN="$HOME/.local/bin" CFG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/rclone-dropbox-bisync" UNIT_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/systemd/user" -find_datastorage() { - local m - if command -v findmnt >/dev/null 2>&1; then - m=$(findmnt -n -o TARGET -S LABEL=DataStorage 2>/dev/null | head -1 || true) - if [ -n "$m" ]; then - echo "$m" - return - fi - fi - for m in /mnt/DataStorage /media/"$USER"/DataStorage /run/media/"$USER"/DataStorage /d /mnt/d /mnt/data; do - if [ -d "$m/Dropbox" ]; then - echo "$m" - return - fi - done - return 1 -} - need() { command -v "$1" >/dev/null 2>&1 } @@ -43,12 +25,13 @@ if ! need go; then exit 1 fi -VOL=$(find_datastorage) || { - echo "NTFS volume LABEL=DataStorage (or .../Dropbox) not mounted" >&2 - exit 1 -} +VOL="$HOME/DataStorage" DROPBOX="$VOL/Dropbox" WORKDIR="$VOL/rclone-bisync" +[ -d "$VOL" ] || { + echo "expected DataStorage already mounted at $VOL" >&2 + exit 1 +} [ -d "$DROPBOX" ] || { echo "missing $DROPBOX" >&2 exit 1 @@ -111,6 +94,6 @@ case ":$PATH:" in *) echo "Add $BIN to PATH (e.g. export PATH=\"$BIN:\$PATH\" in ~/.profile)" ;; esac -echo "Configured path1=$DROPBOX workdir=$WORKDIR (volume DataStorage)" +echo "Configured path1=$DROPBOX workdir=$WORKDIR (~/DataStorage)" echo "Startup: autostart desktop + systemd --user timer every 15 min" echo "Put RCLONE_TEST on dropbox: as well. Remote dropbox: must exist in rclone.conf."